[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2006-11-30 20:17:39
Message-ID: 1164917859.785905.22477.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 609446 by djarvie:

Bug 138124: fix crash when an alarm triggers while the user is answering the \
confirmation prompt when deleting it

 M  +11 -9     mainwindow.cpp  


--- trunk/KDE/kdepim/kalarm/mainwindow.cpp #609445:609446
@@ -799,6 +799,17 @@
 void MainWindow::slotDelete()
 {
 	QList<const KAEvent*> events = mListView->selectedEvents();
+	// Copy the events to be deleted, in case any are deleted by being
+	// triggered while the confirmation prompt is displayed.
+	QList<KAEvent> eventCopies;
+	Undo::EventList undos;
+	AlarmResources* resources = AlarmResources::instance();
+	for (int i = 0, end = events.count();  i < end;  ++i)
+	{
+		const KAEvent* event = events[i];
+		eventCopies.append(*event);
+		undos.append(*event, resources->resourceForIncidence(event->id()));
+	}
 	if (Preferences::confirmAlarmDeletion())
 	{
 		int n = events.count();
@@ -812,15 +823,6 @@
 	}
 
 	// Delete the events from the calendar and displays
-	QList<KAEvent> eventCopies;
-	Undo::EventList undos;
-	AlarmResources* resources = AlarmResources::instance();
-	for (int i = 0, end = events.count();  i < end;  ++i)
-	{
-		const KAEvent* event = events[i];
-		eventCopies.append(*event);
-		undos.append(*event, resources->resourceForIncidence(event->id()));
-	}
 	KAlarm::deleteEvents(eventCopies, true, this);
 	Undo::saveDeletes(undos);
 }


[prev in list] [next in list] [prev in thread] [next in thread]