diff -r aa5a574040a4 -r a93990e5815e watchdog/src/watchdog.cpp --- a/watchdog/src/watchdog.cpp Tue Jul 06 14:44:37 2010 +0300 +++ b/watchdog/src/watchdog.cpp Wed Aug 18 10:12:07 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; }