From a5cb39aaf44b1f84003fb2ec2d36f07bf28916e4 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 16 Aug 2019 08:02:14 -0400
Subject: moved all geometry save, restore and reset to GeometrySettings
 changed reset button in settings to restart immediately

---
 src/main.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 8eee41e4..6d4108fa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -718,6 +718,7 @@ int runApplication(MOApplication &application, SingleInstance &instance,
     }
 
     int res = 1;
+
     { // scope to control lifetime of mainwindow
       // set up main window and its data structures
       MainWindow mainWindow(settings, organizer, pluginContainer);
@@ -743,17 +744,20 @@ int runApplication(MOApplication &application, SingleInstance &instance,
 
       splash.finish(&mainWindow);
 
-      const auto ret = application.exec();
+      res = application.exec();
 
       NexusInterface::instance(&pluginContainer)
         ->getAccessManager()->setTopLevelWidget(nullptr);
-
-      return ret;
     }
+
+    settings.geometry().resetIfNeeded();
+    return res;
+
   } catch (const std::exception &e) {
     reportError(e.what());
-    return 1;
   }
+
+  return 1;
 }
 
 int doCoreDump(env::CoreDumpTypes type)
-- 
cgit v1.3.1