From 71c2e6a1355dd4c9f24052b6a84e5cb0344e9369 Mon Sep 17 00:00:00 2001 From: Bo Thorsen Date: Thu, 19 Feb 2004 12:50:18 +0000 Subject: [PATCH] Don't crash if the user decides to kill korganizer during the startup. Fail instead svn path=/trunk/kdepim/; revision=289368 --- kmgroupware.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kmgroupware.cpp b/kmgroupware.cpp index dd8a826d2..37616dbb8 100644 --- a/kmgroupware.cpp +++ b/kmgroupware.cpp @@ -434,9 +434,10 @@ static bool connectToKOrganizer() QCString dummy; // OK, so korganizer (or kontact) is running. Now ensure the object we want is available. if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", QByteArray(), dcopService, dummy ) ) { - KDCOPServiceStarter::self()->startServiceFor( "DCOP/Organizer", QString::null, - QString::null, &error, &dcopService ); - assert( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", QByteArray(), dcopService, dummy ) ); + KDCOPServiceStarter::self()->startServiceFor( "DCOP/Organizer", QString::null, + QString::null, &error, &dcopService ); + if( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", QByteArray(), dcopService, dummy ) ) + return false; } mKOrganizerIfaceStub = new KOrganizerIface_stub( kapp->dcopClient(),