r19775 by jghali - 12898: Edit > Select All/Advanced Select All/Deselect All may cause crash while in modeEditClip

[scribus-commit]

Author: jghali
Date: Sun Feb  1 08:35:37 2015
New Revision: 19775

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19775
Log:
12898: Edit > Select All/Advanced Select All/Deselect All may cause crash while in modeEditClip

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19775&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Sun Feb  1 08:35:37 2015
@@ -156,7 +156,13 @@
 		case modeEditClip:
 			{
 				if (newMode != modeEditClip)
+				{
 					scmw->NoFrameEdit();
+					// #12898: disable select actions in Edit menu editing nodes
+					(*a_scrActions)["editSelectAll"]->setEnabled(true);
+					(*a_scrActions)["editSelectAllOnLayer"]->setEnabled(true);
+					(*a_scrActions)["editDeselectAll"]->setEnabled(true);
+				}
 			}
 			break;
 		case modeEditGradientVectors:
@@ -290,7 +296,13 @@
 		case modeEditClip:
 			{
 				if (oldMode != modeEditClip)
+				{
 					scmw->ToggleFrameEdit();
+					// #12898: disable select actions in Edit menu editing nodes
+					(*a_scrActions)["editSelectAll"]->setEnabled(false);
+					(*a_scrActions)["editSelectAllOnLayer"]->setEnabled(false);
+					(*a_scrActions)["editDeselectAll"]->setEnabled(false);
+				}
 			}
 			break;
 		case modeEditGradientVectors:
@@ -411,7 +423,8 @@
 
 	bool inAnEditMode = doc->inAnEditMode();
 
-	if (!doc->inASpecialEditMode()) // #12897: Using Undo/Redo those actions are re-enabled causing crash
+	// #12897: Using Undo/Redo those actions are re-enabled causing crash
+	if (!doc->inASpecialEditMode())
 	{
 		(*a_scrActions)["editSelectAllOnLayer"]->setEnabled(true);
 		(*a_scrActions)["editDeselectAll"]->setEnabled(SelectedType != -1);