diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-03 15:33:32 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-03 15:33:32 +0000 |
| commit | 2b1fbfe66121ceb28f5c75ed4c3b3fcf115e7bd9 (patch) | |
| tree | b4bc70509f1774ee1c9e0b4f8bd6ec211fb8a48a /vcl/source | |
| parent | 02d4898195fde49ca01728f01c62b8c23c2584d3 (diff) | |
INTEGRATION: CWS vcl58 (1.5.244); FILE MERGED
2006/04/28 11:21:08 hdu 1.5.244.2: #126816# use DBG_ERROR on restart of destroyed timer
2006/04/28 10:54:27 hdu 1.5.244.1: #126816# assert restart of destroyed timer
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/app/timer.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx index 93c702ed5a0a..93b86713323f 100644 --- a/vcl/source/app/timer.cxx +++ b/vcl/source/app/timer.cxx @@ -4,9 +4,9 @@ * * $RCSfile: timer.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 11:43:41 $ + * last change: $Author: rt $ $Date: 2006-05-03 16:33:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -54,6 +54,9 @@ #ifndef _SV_SALINST_HXX #include <salinst.hxx> #endif +#ifndef _DEBUG_HXX +#include <tools/debug.hxx> +#endif #define protected public #ifndef _SV_TIMER_HXX @@ -340,6 +343,10 @@ void Timer::Start() if ( mnTimeout < pSVData->mnTimerPeriod ) ImplStartTimer( pSVData, mnTimeout ); } + else if( !mpTimerData->mpSVTimer ) // TODO: remove when guilty found + { + DBG_ERROR( "Timer::Start() on a destroyed Timer!" ); + } else { mpTimerData->mnUpdateTime = Time::GetSystemTicks(); |