1 files changed, 17 insertions, 22 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 7783dd4..d25f671 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -519,2 +519,19 @@ void  KOListView::setAlarm()
                 inc->newAlarm();
+            Alarm *alarm = inc->alarms().first();
+            alarm->setEnabled(true);
+            int j = kap.mAlarmTimeEdit->value()* -60;
+            if (kap.mAlarmIncrCombo->currentItem() == 1)
+                j = j * 60;
+            else if (kap.mAlarmIncrCombo->currentItem() == 2)
+                j = j * (60 * 24);
+            alarm->setStartOffset( j );
+
+            if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
+                alarm->setProcedureAlarm(kap.mAlarmProgram);
+            }
+            else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
+                alarm->setAudioAlarm(kap.mAlarmSound);
+            else
+                alarm->setType(Alarm::Invalid);
+        } else {
             QPtrList<Alarm> alarms = inc->alarms();
@@ -522,24 +539,2 @@ void  KOListView::setAlarm()
             for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
-                alarm->setEnabled(true);
-                int j = kap.mAlarmTimeEdit->value()* -60;
-                if (kap.mAlarmIncrCombo->currentItem() == 1)
-                    j = j * 60;
-                else if (kap.mAlarmIncrCombo->currentItem() == 2)
-                    j = j * (60 * 24);
-                alarm->setStartOffset( j );
-
-                if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
-                    alarm->setProcedureAlarm(kap.mAlarmProgram);
-                }
-                else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
-                    alarm->setAudioAlarm(kap.mAlarmSound);
-                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 ) {
                 alarm->setEnabled(false);