diff options
| author | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-31 09:34:38 +1100 |
| commit | 798ddfaab500bb212f620cf095328eee5eb140a4 (patch) | |
| tree | 55b5d0b90affd88063c04b7ff62fea1616b83e80 /backends/timer/bada | |
| parent | ef663f95a516d8fe47a245653d418c047361281a (diff) | |
| parent | fdc80fd952120ecb8a4941edd4c2e404cdc5fa33 (diff) | |
| download | scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.gz scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.tar.bz2 scummvm-rg350-798ddfaab500bb212f620cf095328eee5eb140a4.zip | |
Merge branch 'master' into hopkins
Diffstat (limited to 'backends/timer/bada')
| -rw-r--r-- | backends/timer/bada/timer.cpp | 4 | ||||
| -rw-r--r-- | backends/timer/bada/timer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/timer/bada/timer.cpp b/backends/timer/bada/timer.cpp index b7daf02b49..e41ecd4864 100644 --- a/backends/timer/bada/timer.cpp +++ b/backends/timer/bada/timer.cpp @@ -49,7 +49,7 @@ bool TimerSlot::OnStart() { AppLog("failed to start timer"); return false; } - + AppLog("started timer %d", _interval); return true; } @@ -57,7 +57,7 @@ bool TimerSlot::OnStart() { void TimerSlot::OnStop() { AppLog("timer stopped"); if (_timer) { - _timer->Cancel(); + _timer->Cancel(); delete _timer; _timer = NULL; } diff --git a/backends/timer/bada/timer.h b/backends/timer/bada/timer.h index f6ae4517c7..826064d7ff 100644 --- a/backends/timer/bada/timer.h +++ b/backends/timer/bada/timer.h @@ -51,7 +51,7 @@ public: BadaTimerManager(); ~BadaTimerManager(); - bool installTimerProc(TimerProc proc, int32 interval, void *refCon, + bool installTimerProc(TimerProc proc, int32 interval, void *refCon, const Common::String &id); void removeTimerProc(TimerProc proc); |