[win] Cleanup notifications on exit

qgis · Aug 31, 2018 · b55ab2e · b55ab2e
1 parent 8f1fb1e
commit b55ab2e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1532,6 +1532,8 @@ QgisApp::~QgisApp()
     delete canvas;
   }
 
+  QgsGui::instance()->nativePlatformInterface()->cleanup();
+
   // This function *MUST* be the last one called, as it destroys in
   // particular GDAL. As above objects can hold GDAL/OGR objects, it is not
   // safe destroying them afterwards

diff --git a/src/native/qgsnative.cpp b/src/native/qgsnative.cpp
@@ -21,6 +21,9 @@
 #include <QUrl>
 #include <QFileInfo>
 
+void QgsNative::cleanup()
+{}
+
 QgsNative::Capabilities QgsNative::capabilities() const
 {
   return nullptr;

diff --git a/src/native/qgsnative.h b/src/native/qgsnative.h
@@ -46,6 +46,12 @@ class NATIVE_EXPORT QgsNative
 
     virtual ~QgsNative() = default;
 
+    /**
+     * Called on QGIS exit, allowing the native interface to gracefully
+     * cleanup and exit.
+     */
+    virtual void cleanup();
+
     /**
      * Returns the native interface's capabilities.
      */

diff --git a/src/native/win/qgswinnative.cpp b/src/native/win/qgswinnative.cpp
@@ -58,6 +58,11 @@ void QgsWinNative::initializeMainWindow( QWindow *window,
   }
 }
 
+void QgsWinNative::cleanup()
+{
+  WinToastLib::WinToast::instance()->clear();
+}
+
 void QgsWinNative::openFileExplorerAndSelectFile( const QString &path )
 {
   const QString nativePath = QDir::toNativeSeparators( path );

diff --git a/src/native/win/qgswinnative.h b/src/native/win/qgswinnative.h
@@ -35,6 +35,7 @@ class NATIVE_EXPORT QgsWinNative : public QgsNative
                                const QString &applicationName,
                                const QString &organizationName,
                                const QString &version ) override;
+    void cleanup() override;
     void openFileExplorerAndSelectFile( const QString &path ) override;
     void showUndefinedApplicationProgress() override;
     void setApplicationProgress( double progress ) override;