1 files changed, 4 insertions, 9 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 7783dd4..d25f671 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -518,7 +518,5 @@ void  KOListView::setAlarm()
             if (inc->alarms().count() == 0) 
                 inc->newAlarm();
-            QPtrList<Alarm> alarms = inc->alarms();
-            Alarm *alarm;
-            for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
+            Alarm *alarm = inc->alarms().first();
                 alarm->setEnabled(true);
                 int j = kap.mAlarmTimeEdit->value()* -60;
@@ -536,11 +534,8 @@ void  KOListView::setAlarm()
                 else
                     alarm->setType(Alarm::Invalid);
-                //alarm->setAudioAlarm("default");
-                // TODO: Deal with multiple alarms
-                break; // For now, stop after the first alarm
-            }
         } else {
-            Alarm* alarm = inc->alarms().first();
-            if ( alarm ) {
+            QPtrList<Alarm> alarms = inc->alarms();
+            Alarm *alarm;
+            for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                 alarm->setEnabled(false);
                 alarm->setType(Alarm::Invalid);