Blob Blame History Raw
Index: khotkeys/kcontrol/condition_list_widget.cpp
===================================================================
--- khotkeys/kcontrol/condition_list_widget.cpp	(Revision 781669)
+++ khotkeys/kcontrol/condition_list_widget.cpp	(Revision 781670)
@@ -221,10 +221,14 @@
     }
 
 void Condition_list_widget::delete_pressed()
+{
+    if ( selected_item )
     {
-    conditions.remove( selected_item->condition()); // we own it
-    delete selected_item; // CHECKME snad vyvola signaly pro enable()
+        conditions.remove( selected_item->condition()); // we own it
+        delete selected_item; // CHECKME snad vyvola signaly pro enable()
+        selected_item = NULL;
     }
+}
 
 void Condition_list_widget::modify_pressed()
     {
Index: khotkeys/kcontrol/actions_listview_widget.cpp
===================================================================
--- khotkeys/kcontrol/actions_listview_widget.cpp	(Revision 781557)
+++ khotkeys/kcontrol/actions_listview_widget.cpp	(Revision 781558)
@@ -110,6 +110,7 @@
 //    if( nw == NULL )
 //        nw = current_action()->itemBelow();
     delete saved_current_item;
+    saved_current_item = NULL;
     recent_item = NULL;
 //    if( nw != NULL )
 //        {