X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=main.cpp;h=b0e631f6382cbd4697d2171e30ebab8620065989;hb=cb8989031b8f229c2e8c34b09db64081a2fdc92b;hp=1e4fe577dc11328b4b07167b3ce1c42d16fdd075;hpb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;p=pulseview.git

diff --git a/main.cpp b/main.cpp
index 1e4fe577..b0e631f6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -60,6 +60,7 @@
 #include "pv/mainwindow.hpp"
 #include "pv/session.hpp"
 #include "pv/util.hpp"
+#include "pv/data/segment.hpp"
 
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
@@ -274,13 +275,16 @@ 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");
+	qRegisterMetaType<pv::util::Timestamp>("util::Timestamp");
+	qRegisterMetaType<SharedPtrToSegment>("SharedPtrToSegment");
 
 	// Prepare the global settings since logging needs them early on
 	pv::GlobalSettings settings;
+	settings.add_change_handler(&a);  // Only the application object can't register itself
 	settings.save_internal_defaults();
 	settings.set_defaults_where_needed();
+	settings.apply_language();
 	settings.apply_theme();
 
 	pv::logging.init();
@@ -340,8 +344,7 @@ int main(int argc, char *argv[])
 				w.add_default_session();
 			else
 				for (string& open_file : open_files)
-					w.add_session_with_file(open_file, open_file_format,
-						open_setup_file);
+					w.add_session_with_file(open_file, open_file_format, open_setup_file);
 
 #ifdef ENABLE_SIGNALS
 			if (SignalHandler::prepare_signals()) {