summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 0e92040..b933340 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -742,48 +742,49 @@ void ServerApplication::shutdown( ShutdownImpl::Type t )
742 742
743void ServerApplication::restart() 743void ServerApplication::restart()
744{ 744{
745 if ( allowRestart ) { 745 if ( allowRestart ) {
746 746
747 /* 747 /*
748 * Applets and restart is a problem. Some applets delete 748 * Applets and restart is a problem. Some applets delete
749 * their widgets even if ownership gets transfered to the 749 * their widgets even if ownership gets transfered to the
750 * parent (Systray ) but deleting the applet may be unsafe 750 * parent (Systray ) but deleting the applet may be unsafe
751 * as well ( double deletion ). Some have topLevel widgets 751 * as well ( double deletion ). Some have topLevel widgets
752 * and when we dlclose and then delete the widget we will 752 * and when we dlclose and then delete the widget we will
753 * crash and an crash during restart is not nice 753 * crash and an crash during restart is not nice
754 */ 754 */
755#ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED 755#ifdef ALL_APPLETS_ON_THIS_WORLD_ARE_FIXED
756 /* same as above */ 756 /* same as above */
757 emit aboutToQuit(); 757 emit aboutToQuit();
758 prepareForTermination(TRUE); 758 prepareForTermination(TRUE);
759 doRestart = TRUE; 759 doRestart = TRUE;
760 quit(); 760 quit();
761#else 761#else
762 prepareForTermination( true ); 762 prepareForTermination( true );
763 for ( int fd = 3; fd < 100; fd++ ) 763 for ( int fd = 3; fd < 100; fd++ )
764 close( fd ); 764 close( fd );
765 execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL ); 765 execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL );
766 execl( OPIE_BINDIR "/qpe", "qpe", NULL );
766 exit( 1 ); 767 exit( 1 );
767#endif 768#endif
768 } 769 }
769} 770}
770 771
771void ServerApplication::rereadVolumes() 772void ServerApplication::rereadVolumes()
772{ 773{
773 Config cfg( "qpe" ); 774 Config cfg( "qpe" );
774 cfg. setGroup ( "Volume" ); 775 cfg. setGroup ( "Volume" );
775 776
776 m_screentap_sound = cfg. readBoolEntry ( "TouchSound" ); 777 m_screentap_sound = cfg. readBoolEntry ( "TouchSound" );
777 m_keyclick_sound = cfg. readBoolEntry ( "KeySound" ); 778 m_keyclick_sound = cfg. readBoolEntry ( "KeySound" );
778 m_alarm_sound = cfg. readBoolEntry ( "AlarmSound" ); 779 m_alarm_sound = cfg. readBoolEntry ( "AlarmSound" );
779} 780}
780 781
781 782
782void ServerApplication::checkMemory() 783void ServerApplication::checkMemory()
783{ 784{
784#if defined(QPE_HAVE_MEMALERTER) 785#if defined(QPE_HAVE_MEMALERTER)
785 static bool ignoreNormal=TRUE; 786 static bool ignoreNormal=TRUE;
786 static bool existingMessage=FALSE; 787 static bool existingMessage=FALSE;
787 788
788 if(existingMessage) 789 if(existingMessage)
789 return; // don't show a second message while still on first 790 return; // don't show a second message while still on first