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

List:       kde-commits
Subject:    KDE/kdepim/kalarm
From:       David Jarvie <djarvie () kde ! org>
Date:       2010-10-28 15:19:47
Message-ID: 20101028151947.46487AC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1190686 by djarvie:

Bug 251317: Fix crash if alarm triggers while its deletion confirmation prompt is visible.
(part 2)


 M  +3 -3      mainwindow.cpp  


--- trunk/KDE/kdepim/kalarm/mainwindow.cpp #1190685:1190686
@@ -824,15 +824,15 @@
 #ifdef __GNUC__
 #warning Check no crash if alarms trigger while their delete confirmation is visible
 #endif
-	KAEvent::List::Iterator eit = events.begin();
 	for (int i = 0, end = ids.count();  i < end;  ++i)
 	{
 		AlarmResource* r = resources->resourceForEvent(ids[i]);
 		if (!r)
-			eit = events.erase(eit);
+			events[i] = 0;
 		else
-			undos.append(*(*eit++), r);
+			undos.append(*events[i], r);
 	}
+	events.removeAll((KAEvent*)0);
 #endif
 
 	if (events.isEmpty())
[prev in list] [next in list] [prev in thread] [next in thread]