equal
deleted
inserted
replaced
159 // Destructor |
159 // Destructor |
160 // --------------------------------------------------------------------------- |
160 // --------------------------------------------------------------------------- |
161 // |
161 // |
162 CWatchdog::~CWatchdog() |
162 CWatchdog::~CWatchdog() |
163 { |
163 { |
164 delete iShutdownObserver; |
164 delete iShutdownObserver; |
|
165 iShutdownObserver = NULL; |
165 delete iSelfShutdownObserver; |
166 delete iSelfShutdownObserver; |
|
167 iSelfShutdownObserver = NULL; |
166 Cancel(); |
168 Cancel(); |
167 } |
169 } |
168 |
170 |
169 // --------------------------------------------------------------------------- |
171 // --------------------------------------------------------------------------- |
170 // Active object's request handling. |
172 // Active object's request handling. |
302 { |
304 { |
303 TRAP( err, MainL() ); |
305 TRAP( err, MainL() ); |
304 } |
306 } |
305 |
307 |
306 delete cleanupStack; |
308 delete cleanupStack; |
|
309 cleanupStack = NULL; |
307 return err; |
310 return err; |
308 } |
311 } |