diff -r 6b87b143d312 -r 71da52165949 photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/src/t_glxcommandhandlermarking.cpp --- a/photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/src/t_glxcommandhandlermarking.cpp Fri Feb 19 22:51:01 2010 +0200 +++ b/photosgallery/viewframework/commandhandlers/tsrc/ut__commandhandlermarking/src/t_glxcommandhandlermarking.cpp Fri Mar 12 15:42:44 2010 +0200 @@ -248,8 +248,11 @@ CGlxMarkingCommandHandlerTester::~CGlxMarkingCommandHandlerTester() { - iMarker->Deactivate(); - + if (iMarker) + { + iMarker->Deactivate(); + } + iCommandHandlerList.ResetAndDestroy(); iCommandHandlerList.Close();