Write 1.4.0 changelog.

[nageru] / main.cpp

diff --git a/main.cpp b/main.cpp
index f0f70ac8c71b3084284cac4a445fa1332d776178..e2d2cec4ee42c46f12527c9f29be3972302cb0ea 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -5,13 +5,13 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <epoxy/gl.h>
-
+#include <epoxy/gl.h>  // IWYU pragma: keep
 #include <QApplication>
 #include <QCoreApplication>
 #include <QGL>
 #include <QSize>
 #include <QSurfaceFormat>
+#include <string>
 
 #include "context.h"
 #include "flags.h"
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
        global_share_widget = new QGLWidget();
 
        MainWindow mainWindow;
-       mainWindow.resize(QSize(1500, 810));
+       mainWindow.resize(QSize(1500, 850));
        mainWindow.show();
 
        app.installEventFilter(&mainWindow);  // For white balance color picking.
@@ -67,6 +67,9 @@ int main(int argc, char *argv[])
                fprintf(stderr, "Failed to lock Nageru into RAM. You probably want to\n");
                fprintf(stderr, "increase \"memlock\" for your user in limits.conf\n");
                fprintf(stderr, "for better realtime behavior.\n");
+               uses_mlock = false;
+       } else {
+               uses_mlock = true;
        }
 
        int rc = app.exec();