Improve initialization order.

[dorian] / main.cpp

diff --git a/main.cpp b/main.cpp
index 7de740b..3f56fbc 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -51,15 +51,16 @@ int main(int argc, char *argv[])
     a.processEvents();
 #endif
 
-    // Create main window, run event loop
-    {
-        MainWindow w;
+    // Create main window, re-apply settings, run event loop
+    MainWindow *mainWindow = new MainWindow();
+    settings->apply();
+    mainWindow->initialize();
 #ifdef Q_OS_SYMBIAN
-        splash->close();
-        splash->deleteLater();
+    splash->close();
+    splash->deleteLater();
 #endif
-        ret = a.exec();
-    }
+    ret = a.exec();
+    delete mainWindow;
 
     // Re-start application if event loop exit code was 1000
     if (ret == 1000) {