r18886 by fschmid - Fixed Bug #12114: Double-clicking on Spiral entries in "Outline" window crashes Scribus in determined condition

[scribus-commit]

Author: fschmid
Date: Sat Mar  8 21:03:01 2014
New Revision: 18886

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18886
Log:
Fixed Bug #12114: Double-clicking on Spiral entries in "Outline" window crashes Scribus in determined condition

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18886&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Mar  8 21:03:01 2014
@@ -6819,6 +6819,7 @@
 		// Restore/save action shortcuts when entering/leaving table edit mode.
 		if (mode != modeEditTable && oldMode == modeEditTable)
 		{
+			outlinePalette->setEnabled(true);
 			charPalette->setEnabled(false, 0);
 			enableTextActions(&scrActions, false);
 			scrActions["insertSampleText"]->setEnabled(false);
@@ -6827,6 +6828,7 @@
 		}
 		else if (mode == modeEditTable && oldMode != modeEditTable)
 		{
+			outlinePalette->setEnabled(false);
 			charPalette->setEnabled(true, currItem);
 			scrActions["insertSampleText"]->setEnabled(true);
 			scrActions["toolsEditWithStoryEditor"]->setEnabled(true);
@@ -7029,6 +7031,7 @@
 			case modeEditPolygon:
 			case modeEditSpiral:
 				view->setCursor(QCursor(Qt::CrossCursor));
+				outlinePalette->setEnabled(false);
 				break;
 			default:
 				view->setCursor(QCursor(Qt::ArrowCursor));
@@ -7046,6 +7049,7 @@
 		if (mode == modeNormal)
 		{
 			propertiesPalette->setGradientEditMode(false);
+			outlinePalette->setEnabled(true);
 		}
 		if (mode == modeLinkFrames)
 			doc->ElemToLink = doc->m_Selection->itemAt(0);