diff -r f7ac710697a9 -r 06ff229162e9 src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp --- a/src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp Mon May 03 12:48:33 2010 +0300 +++ b/src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp Fri May 14 16:09:54 2010 +0300 @@ -66,29 +66,15 @@ } TInt error = KErrNone; - if (ServerRunning()) { - if (!Handle()) { - TVersion serverVersion(KHbServerMajor, KHbServerMinor, KHbServerBuild); - error = CreateSession(KHbServerName, serverVersion, KNumAsyncMessageSlots, - EIpcSession_Unsharable, 0, aStatus); - } - } else { - error = Connect(); - User::RequestComplete(aStatus, error); + if (!Handle()) { + TVersion serverVersion(KHbServerMajor, KHbServerMinor, KHbServerBuild); + error = CreateSession(KHbServerName, serverVersion, KNumAsyncMessageSlots, + EIpcSession_Unsharable, 0, aStatus); } TRACE_EXIT return error; } -TBool RHbDeviceDialogClientSession::ServerRunning() const -{ - TRACE_ENTRY - TFindServer findHbServer(KHbServerName); - TFullName name; - TRACE_EXIT - return findHbServer.Next(name) == KErrNone; -} - /*! \internal */ @@ -130,6 +116,15 @@ return error; } +TBool RHbDeviceDialogClientSession::ServerRunning() +{ + TRACE_ENTRY + TFindServer findHbServer(KHbServerName); + TFullName name; + TRACE_EXIT + return findHbServer.Next(name) == KErrNone; +} + /*! \internal */