diff -r 63c982fb92f2 -r b73252188534 watchdog/src/watchdog.cpp --- a/watchdog/src/watchdog.cpp Thu Jul 15 19:07:24 2010 +0300 +++ b/watchdog/src/watchdog.cpp Thu Aug 19 10:20:41 2010 +0300 @@ -161,8 +161,10 @@ // CWatchdog::~CWatchdog() { - delete iShutdownObserver; + delete iShutdownObserver; + iShutdownObserver = NULL; delete iSelfShutdownObserver; + iSelfShutdownObserver = NULL; Cancel(); } @@ -304,5 +306,6 @@ } delete cleanupStack; + cleanupStack = NULL; return err; }