[console] Correctly save settings when exiting app

The closeEvent approach which was previously used is not reliable on application exit, so manually force a settings save in this case too. Avoids loss of command history when closing QGIS Also remove the manual "Save" history action, as it's redundant (cherry picked from commit cce5c4e)
qgis · Dec 6, 2018 · 6d61938 · 6d61938
1 parent fc03f40
commit 6d61938
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/python/console/console.py b/python/console/console.py
@@ -87,6 +87,10 @@ def __init__(self, parent=None):
         if iface and not iface.mainWindow().restoreDockWidget(self):
             iface.mainWindow().addDockWidget(Qt.BottomDockWidgetArea, self)
 
+        # closeEvent is not always called for this widget -- so we also trigger a settings
+        # save on application exit
+        QgsApplication.instance().aboutToQuit.connect(self.console.saveSettingsConsole)
+
     def activate(self):
         self.activateWindow()
         self.raise_()

diff --git a/python/console/console_sci.py b/python/console/console_sci.py
@@ -509,11 +509,6 @@ def contextMenuEvent(self, e):
         subMenu.addAction(
             QCoreApplication.translate("PythonConsole", "Show"),
             self.showHistory, 'Ctrl+Shift+SPACE')
-        subMenu.addSeparator()
-        subMenu.addAction(
-            QCoreApplication.translate("PythonConsole", "Save"),
-            self.writeHistoryFile)
-        subMenu.addSeparator()
         subMenu.addAction(
             QCoreApplication.translate("PythonConsole", "Clear File"),
             self.clearHistory)