X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=feff17aaf47cd54299ff114871e32247aceedce1;hp=640168ff79b8c316f7638cfa423e5625cffe0251;hb=bcb4c327ee9b8d2172d126429ba017884d079d4c;hpb=c1a688dec0b117146a47cc5200e5bc81e445fd2c

diff --git a/main.cpp b/main.cpp
index 640168f..feff17a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,6 +41,8 @@
 
 #include "pv/application.hpp"
 #include "pv/devicemanager.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/logging.hpp"
 #include "pv/mainwindow.hpp"
 #include "pv/session.hpp"
 
@@ -189,6 +191,12 @@ int main(int argc, char *argv[])
 	if (argc - optind == 1)
 		open_file = argv[argc - 1];
 
+	// Prepare the global settings since logging needs them early on
+	pv::GlobalSettings settings;
+	settings.set_defaults_where_needed();
+
+	pv::logging.init();
+
 	// Initialise libsigrok
 	context = sigrok::Context::create();
 	pv::Session::sr_context = context;