4 files changed, 8 insertions, 2 deletions

diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index 7f5aa7b..6193ddc 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -332,4 +332,6 @@ void iPAQ::playAlarmSound()
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
+    if(!snd.isFinished())
+	return;
 
     changeMixerForAlarm(0, "/dev/sound/mixer", &snd );
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp
index 0cddf85..c75ea3a 100644
--- a/libopie2/opiecore/device/odevice_ramses.cpp
+++ b/libopie2/opiecore/device/odevice_ramses.cpp
@@ -100,4 +100,6 @@ void Ramses::playAlarmSound()
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
+    if(!snd.isFinished())
+	return;
 
     changeMixerForAlarm( 0, "/dev/sound/mixer" , &snd);
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index fd46b95..34876da 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -320,4 +320,6 @@ void SIMpad::playAlarmSound()
 #ifndef QT_NO_SOUND
     static Sound snd ( "alarm" );
+    if(!snd.isFinished())
+	return;
 
     /* save as the Sound is static! */
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 64fa199..733479e 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -346,8 +346,8 @@ void Zaurus::buzzer ( int sound )
     // sound capabilities.. Otherwise we expect to have the buzzer
     // device..
-    if ( snd ){
+    if ( snd && snd->isFinished() ){
         changeMixerForAlarm( 0, "/dev/sound/mixer", snd );
         snd-> play();
-    } else {
+    } else if( !snd ) {
         int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );