diff -r 48ae3789ce00 -r df7a93ede42e bluetoothengine/bteng/src/btengserver.cpp --- a/bluetoothengine/bteng/src/btengserver.cpp Mon May 03 14:36:07 2010 +0300 +++ b/bluetoothengine/bteng/src/btengserver.cpp Wed May 05 09:56:48 2010 +0300 @@ -166,6 +166,7 @@ iPluginMgr = CBTEngSrvPluginMgr::NewL( this ); iBBConnMgr = CBTEngSrvBBConnMgr::NewL( this, iSocketServ ); + iSdpDbHandler = NULL; TCallBack idleCb( IdleTimerCallBack, this ); iIdleCallBack.Set( idleCb ); @@ -216,7 +217,10 @@ RProperty::Delete( KPSUidBluetoothEnginePrivateCategory, KBTTurnBTOffQueryOn ); RProperty::Delete( KPSUidBluetoothEnginePrivateCategory, KBTNotifierLocks ); delete iTimer; - delete iSdpDbHandler; + if ( iSdpDbHandler ) + { + delete iSdpDbHandler; + } delete iWatcher; delete iSettingsMgr; delete iPluginMgr;