diff -r f979ecb2b13e -r 42814f902fe6 calendarui/organizerplugin/aiagendapluginengine/src/CalenAsyncCommands.cpp --- a/calendarui/organizerplugin/aiagendapluginengine/src/CalenAsyncCommands.cpp Tue Feb 02 10:12:19 2010 +0200 +++ b/calendarui/organizerplugin/aiagendapluginengine/src/CalenAsyncCommands.cpp Fri Feb 19 22:49:53 2010 +0200 @@ -195,6 +195,11 @@ { iEngine.iInstanceView = CCalInstanceView::NewL( sessionArray, *this ); } + else + { + iState = ESignalCaller; + CompleteSelf(); + } } break; @@ -366,8 +371,8 @@ { if( !iEngine.iInstanceView ) { - // open command / instance view creation failed - User::Leave( KErrNotFound ); + iState = EFinalize; + CompleteSelf(); } else { @@ -551,8 +556,15 @@ { case EFetch: { - // create date range and fetch entries - + if( !iEngine.iInstanceView ) + { + iState = EFinalize; + CompleteSelf(); + } + else + { + // create date range and fetch entries + CalCommon::TCalViewFilter filter = CalCommon::EIncludeAppts | CalCommon::EIncludeReminder; @@ -562,6 +574,7 @@ iState = EFinalize; CompleteSelf(); + } } break; @@ -726,9 +739,11 @@ if( !iEngine.iInstanceView ) { - User::Leave( KErrBadHandle ); // we have a null pointer + iState = ESignalCaller; + CompleteSelf(); } - + else + { iEngine.iInstanceView->FindInstanceL( iInstanceArray, CalCommon::EIncludeIncompletedTodos | // only fetch the first instance for repeating to-dos! @@ -737,6 +752,7 @@ iState = ESignalCaller; CompleteSelf(); + } } break; @@ -878,8 +894,8 @@ { if( !iEngine.iInstanceView ) { - // open command / instance view creation failed - User::Leave( KErrNotFound ); + iState = EFinalize; + CompleteSelf(); } else {