Ruler: Fix context menu for items on the ruler

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index c7fe9bb2dedc38029d115b324c3da58d2a3f6d58..a77969ea7f72313e6c42b71cf0cd09980c53e0da 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -54,6 +54,7 @@
 #include "pv/logging.hpp"
 #include "pv/mainwindow.hpp"
 #include "pv/session.hpp"
+#include "pv/util.hpp"
 
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
@@ -254,9 +255,14 @@ int main(int argc, char *argv[])
        for (int i = 0; i < argc; i++)
                open_files.emplace_back(argv[i]);
 
+       qRegisterMetaType<pv::util::Timestamp>("util::Timestamp");
+       qRegisterMetaType<uint64_t>("uint64_t");
+
        // Prepare the global settings since logging needs them early on
        pv::GlobalSettings settings;
+       settings.save_internal_defaults();
        settings.set_defaults_where_needed();
+       settings.apply_theme();
 
        pv::logging.init();
 
@@ -314,7 +320,7 @@ int main(int argc, char *argv[])
                        if (open_files.empty())
                                w.add_default_session();
                        else
-                               for (string open_file : open_files)
+                               for (string& open_file : open_files)
                                        w.add_session_with_file(open_file, open_file_format);
 
 #ifdef ENABLE_SIGNALS