Related: rhbz#650170 don't crash when quickstarter is exited by user

1 files changed, 10 insertions, 1 deletions

diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index 3bb5b7729c..c28e73a543 100644
--- a/sfx2/source/appl/shutdowniconunx.cxx
+++ b/sfx2/source/appl/shutdowniconunx.cxx
@@ -409,8 +409,17 @@ void SAL_DLLPUBLIC_EXPORT plugin_shutdown_sys_tray()
     ::SolarMutexGuard aGuard;
     if( !pTrayIcon )
         return;
-    gtk_widget_destroy( GTK_WIDGET( pTrayIcon ) );
+
+    /* we have to set pTrayIcon to NULL now, because gtk_widget_destroy
+     * causes calling exit_quickstarter_cb (which then calls this func.)
+     * again -> crash.
+     * As an alternative, we could deregister the "destroy" signal here,
+     * but this is simpler .-)
+     */
+    GtkWidget* const pIcon = GTK_WIDGET( pTrayIcon );
     pTrayIcon = NULL;
+	gtk_widget_destroy( pIcon );
+
     pExitMenuItem = NULL;
     pOpenMenuItem = NULL;
     pDisableMenuItem = NULL;