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

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

SVN commit 781988 by mlaurent:

Backport:
Fix crash when we delete actions


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


--- branches/KDE/3.5/kdebase/khotkeys/kcontrol/action_list_widget.cpp #781987:781988
@@ -148,6 +148,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 );
@@ -156,11 +158,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( QListViewItem* item_P )
--- branches/KDE/3.5/kdebase/khotkeys/kcontrol/condition_list_widget.cpp #781987:781988
@@ -213,6 +213,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,
@@ -232,6 +234,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]