From 3c2cc96b62c7025937ef55cf2b1e6f11dd0fcf7a Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Sun, 10 Mar 2019 23:56:06 +0200
Subject: [PATCH] - updated the App.final_save() function

---
 FlatCAMApp.py | 14 +++++++++++++-
 FlatCAMGUI.py | 20 --------------------
 README.md     |  1 +
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index 94e4e63b..7786ea59 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -2932,7 +2932,19 @@ class App(QtCore.QObject):
                 self.should_we_quit = False
                 return
         self.save_defaults()
-        log.debug("Application defaults saved ... Exit event.")
+        log.debug("App.final_save() --> App Defaults saved.")
+
+        if self.should_we_quit is True:
+
+            # save toolbar state to file
+            settings = QSettings("Open Source", "FlatCAM")
+            settings.setValue('saved_gui_state', self.ui.saveState())
+            settings.setValue('maximized_gui', self.ui.isMaximized())
+
+            # This will write the setting to the platform specific storage.
+            del settings
+            log.debug("App.final_save() --> App UI state saved.")
+            QtWidgets.qApp.quit()
 
     def on_toggle_shell(self):
         """
diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py
index 75f3a126..f9702edd 100644
--- a/FlatCAMGUI.py
+++ b/FlatCAMGUI.py
@@ -2565,26 +2565,6 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
 
         self.final_save.emit()
 
-        if self.app.should_we_quit is True:
-            # # save toolbar state to file
-            # with open(self.app.data_path + '\gui_state.config', 'wb') as stream:
-            #     stream.write(self.saveState().data())
-            #     log.debug("FlatCAMGUI.__init__() --> UI state saved.")
-            # QtWidgets.qApp.quit()
-
-            # save toolbar state to file
-            settings = QSettings("Open Source", "FlatCAM")
-            settings.setValue('saved_gui_state', self.saveState())
-            settings.setValue('maximized_gui', self.isMaximized())
-
-            # This will write the setting to the platform specific storage.
-            del settings
-            log.debug("FlatCAMGUI.__init__() --> UI state saved.")
-            QtWidgets.qApp.quit()
-        else:
-            self.app.should_we_quit = True
-            event.ignore()
-
 
 class GeneralPreferencesUI(QtWidgets.QWidget):
     def __init__(self, parent=None):
diff --git a/README.md b/README.md
index 928d3892..18304c65 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ CAD program, and create G-Code for Isolation routing.
 - added some test translation for the ToolCalculators (in Romanian)
 - fixed bug in ToolCutOut where for each tool invocation the signals were reconnected
 - fixed some issues with ToolMeasurement due of above changes
+- updated the App.final_save() function
 
 8.03.2019