1 files changed, 19 insertions, 0 deletions

diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 522ef07..28316a4 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -714,27 +714,46 @@ void ServerApplication::shutdown( ShutdownImpl::Type t )
         // clipboard applet has to stop its poll timer, or Qt/E
         // will hang on quit() right before it emits aboutToQuit()
         emit aboutToQuit ( );
 
         quit();
         break;
     }
 }
 
 void ServerApplication::restart()
 {
     if ( allowRestart ) {
+
+        /*
+         * Applets and restart is a problem. Some applets delete
+         * their widgets even if ownership gets transfered to the
+         * parent (Systray ) but deleting the applet may be unsafe
+         * as well ( double deletion ). Some have topLevel widgets
+         * and when we dlclose and then delete the widget we will
+         * crash and an crash during restart is not nice
+         */
+#ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED
+        /* same as above */
+        emit aboutToQuit();
         prepareForTermination(TRUE);
         doRestart = TRUE;
         quit();
+#else
+        prepareForTermination( true );
+        for ( int fd = 3; fd < 100; fd++ )
+                close( fd );
+        execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
+        exit( 1 );
+#endif
     }
 }
 
 void ServerApplication::rereadVolumes()
 {
     Config cfg( "qpe" );
     cfg. setGroup ( "Volume" );
 
     m_screentap_sound = cfg. readBoolEntry ( "TouchSound" );
     m_keyclick_sound  = cfg. readBoolEntry ( "KeySound" );
     m_alarm_sound     = cfg. readBoolEntry ( "AlarmSound" );
 }