[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/nepomuk/server
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2008-07-30 12:49:27
Message-ID: 1217422167.816222.22300.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 839635 by trueg:

Try to only shutdown initialized services.

BUG: 167655


 M  +5 -2      servicecontroller.cpp  


--- trunk/KDE/kdebase/runtime/nepomuk/server/servicecontroller.cpp #839634:839635
@@ -177,6 +177,7 @@
                  this,
                  SLOT( slotServiceOwnerChanged( const QString&, const QString&, const QString& ) ) );
 
+        d->processControl->setCrashPolicy( ProcessControl::RestartOnCrash );
         return d->processControl->start( KGlobal::dirs()->locate( "exe", "nepomukservicestub" ),
                                          QStringList() << name() );
     }
@@ -193,11 +194,13 @@
         if( d->processControl ) {
             d->processControl->setCrashPolicy( ProcessControl::StopOnCrash );
         }
-        d->serviceControlInterface->shutdown();
 
+        if ( waitForInitialized( 2000 ) ) {
+            d->serviceControlInterface->shutdown();
+        }
+
         if( d->processControl ) {
             d->processControl->stop();
-            d->processControl->setCrashPolicy( ProcessControl::RestartOnCrash );
         }
     }
 }
[prev in list] [next in list] [prev in thread] [next in thread]