diff -r 9a9c174934f5 -r 57d388cc48c1 photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersave.cpp --- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersave.cpp Tue Jan 26 11:58:28 2010 +0200 +++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandlersave.cpp Tue Feb 02 00:10:37 2010 +0200 @@ -77,17 +77,20 @@ // TBool CGlxCommandHandlerSave::ExecuteL(TInt aCommandId) { - TRACER("CGlxCommandHandlerSave::CreateCommandL"); + TRACER("CGlxCommandHandlerSave::ExecuteL"); if(aCommandId == EGlxCmdSave) { - TDataType nullType; - RFile64& imageHandle = iImageViewerInstance->ImageFileHandle(); - if ( imageHandle.SubSessionHandle() != KNullHandle ) - { - CDocumentHandler* handler = CDocumentHandler::NewLC(NULL); - __ASSERT_ALWAYS(handler, Panic(EGlxPanicNullPointer)); - TRAP_IGNORE(handler->CopyL(imageHandle, KNullDesC, nullType, NULL)); - CleanupStack::PopAndDestroy(handler); + RFile64& imageHandle = iImageViewerInstance->ImageFileHandle(); + if ( &imageHandle != NULL ) + { + if ( imageHandle.SubSessionHandle() != KNullHandle ) + { + TDataType nullType; + CDocumentHandler* handler = CDocumentHandler::NewLC(NULL); + __ASSERT_ALWAYS(handler, Panic(EGlxPanicNullPointer)); + TRAP_IGNORE(handler->CopyL(imageHandle, KNullDesC, nullType, NULL)); + CleanupStack::PopAndDestroy(handler); + } } return ETrue; }