diff -r 95d73125a086 -r 7ced047fb7ae uiacceltk/hitchcock/plugins/alfoogmplugin/src/alfoogmplugin.cpp --- a/uiacceltk/hitchcock/plugins/alfoogmplugin/src/alfoogmplugin.cpp Tue Jul 06 15:18:10 2010 +0300 +++ b/uiacceltk/hitchcock/plugins/alfoogmplugin/src/alfoogmplugin.cpp Wed Aug 18 10:42:48 2010 +0300 @@ -51,7 +51,7 @@ // CAlfOogmMonitorPlugin::~CAlfOogmMonitorPlugin() { - + iAlfDirectClient.Disconnect(); } // ----------------------------------------------------------------------------- @@ -90,10 +90,16 @@ // TAny* CreatePlugin() { - CAlfOogmMonitorPlugin* plugin = new(ELeave) CAlfOogmMonitorPlugin; - CleanupStack::PushL(plugin); - plugin->ConstructL(); - CleanupStack::Pop(plugin); + CAlfOogmMonitorPlugin* plugin = new CAlfOogmMonitorPlugin; + if ( plugin ) + { + TRAPD( err, plugin->ConstructL() ); + if ( err != KErrNone ) + { + delete plugin; + plugin = NULL; + } + } return plugin; }