Make the default theme dir pick up the --prefix option given to Meson.

[nageru] / nageru / main.cpp

diff --git a/nageru/main.cpp b/nageru/main.cpp
index c1a52c0489a6d7b4e9054da338635290846cf1cb..b5463754a463bdc60f0be758a18be3add0e8ee71 100644 (file)
--- a/nageru/main.cpp
+++ b/nageru/main.cpp
@@ -24,7 +24,7 @@ extern "C" {
 #ifdef HAVE_CEF
 #include "nageru_cef_app.h"
 #endif
-#include "context.h"
+#include "shared/context.h"
 #include "flags.h"
 #include "image_input.h"
 #include "mainwindow.h"
@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
                // We normally use EGL for zerocopy, but if we use VA against DRM
                // instead of against X11, we turn it off, and then don't need EGL.
                setenv("QT_XCB_GL_INTEGRATION", "xcb_egl", 0);
-               using_egl = true;
        }
        setlinebuf(stdout);
 #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100)
@@ -96,7 +95,7 @@ int main(int argc, char *argv[])
        global_share_widget = new QGLWidget();
        if (!global_share_widget->isValid()) {
                fprintf(stderr, "Failed to initialize OpenGL. Nageru needs at least OpenGL 3.1 to function properly.\n");
-               exit(1);
+               abort();
        }
 
        MainWindow mainWindow;
@@ -120,8 +119,6 @@ int main(int argc, char *argv[])
        }
 
        int rc = app.exec();
-       global_mixer->quit();
-       mainWindow.mixer_shutting_down();
        delete global_mixer;
        ImageInput::shutdown_updaters();
        return rc;