summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-09 23:42:42 (UTC)
committer sandman <sandman>2002-06-09 23:42:42 (UTC)
commit1c56ab829f04ea5b127c1c632cec330e47bca524 (patch) (side-by-side diff)
tree30f0bd7c2d124cbf2dc41f32234922d2f3be19a7
parent25d084dd1a4b69cefcf16a889f22feb39d60f541 (diff)
downloadopie-1c56ab829f04ea5b127c1c632cec330e47bca524.zip
opie-1c56ab829f04ea5b127c1c632cec330e47bca524.tar.gz
opie-1c56ab829f04ea5b127c1c632cec330e47bca524.tar.bz2
Fixed a counter bug in alarm timer loop.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp14
-rw-r--r--core/pim/datebook/datebook.h2
2 files changed, 9 insertions, 7 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 8614b3f..2c2965e 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -81,7 +81,8 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
presetTime( -1 ),
startTime( 8 ), // an acceptable default
syncing(FALSE),
- inSearch(FALSE)
+ inSearch(FALSE),
+ alarmCounter(0)
{
QTime t;
t.start();
@@ -614,6 +615,7 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
if ( found ) {
if ( bSound ) {
Sound::soundAlarm();
+ alarmCounter = 0;
stopTimer = startTimer( 5000 );
}
@@ -683,14 +685,12 @@ void DateBook::flush()
void DateBook::timerEvent( QTimerEvent *e )
{
- static int stop = 0;
- if ( stop < 10 ) {
+ if ( alarmCounter < 10 ) {
+ alarmCounter++;
Sound::soundAlarm();
- stop++;
- } else {
- stop = 0;
- killTimer( e->timerId() );
}
+ else
+ killTimer( e->timerId() );
}
void DateBook::changeClock( bool newClock )
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index d1fe90d..e7be0dd 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -120,6 +120,8 @@ private:
bool syncing;
bool inSearch;
+ int alarmCounter;
+
QString checkEvent(const Event &);
};