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

List:       kde-commits
Subject:    branches/KDE/4.0/kdebase/workspace/khotkeys/kcontrol
From:       Laurent Montel <montel () kde ! org>
Date:       2008-03-04 8:10:13
Message-ID: 1204618213.257812.21076.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 781987 by mlaurent:

Backport:
Fix crash when we delete action


 M  +6 -1      action_list_widget.cpp  
 M  +4 -0      condition_list_widget.cpp  


--- branches/KDE/4.0/kdebase/workspace/khotkeys/kcontrol/action_list_widget.cpp #781986:781987
@@ -153,6 +153,8 @@
 
 void Action_list_widget::copy_pressed()
     {
+        if ( !selected_item )
+            return;
     actions_listview->setSelected( create_listview_item( selected_item->action(),
         selected_item->parent() ? NULL : actions_listview, selected_item->parent(),
         selected_item, true ), true );
@@ -161,11 +163,14 @@
 void Action_list_widget::delete_pressed()
     {
     delete selected_item; // CHECKME snad vyvola signaly pro enable()
+    selected_item = NULL;
     }
 
 void Action_list_widget::modify_pressed()
     {
-    edit_listview_item( selected_item );
+        if ( !selected_item )
+            return;
+        edit_listview_item( selected_item );
     }
 
 void Action_list_widget::current_changed( Q3ListViewItem* item_P )
--- branches/KDE/4.0/kdebase/workspace/khotkeys/kcontrol/condition_list_widget.cpp #781986:781987
@@ -218,6 +218,8 @@
 
 void Condition_list_widget::copy_pressed()
     {
+        if ( !selected_item )
+            return;
     conditions_listview->setSelected( create_listview_item(
         selected_item->condition()->copy( selected_item->condition()->parent()),
         selected_item->parent() ? NULL : conditions_listview,
@@ -237,6 +239,8 @@
 
 void Condition_list_widget::modify_pressed()
     {
+        if ( !selected_item )
+            return;
     edit_listview_item( selected_item );
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]