r15919 by jghali - #9500: Palette does not get disabled when undoing an object creation leading to multiple crashes

[scribus-commit]

Author: jghali
Date: Fri Nov 19 10:07:50 2010
New Revision: 15919

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15919
Log:
#9500: Palette does not get disabled when undoing an object creation leading to multiple crashes

Modified:
    branches/Version135/Scribus/scribus/scribusdoc.cpp
    branches/Version135/Scribus/scribus/selection.cpp

Modified: branches/Version135/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15919&path=/branches/Version135/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribusdoc.cpp (original)
+++ branches/Version135/Scribus/scribus/scribusdoc.cpp Fri Nov 19 10:07:50 2010
@@ -1238,6 +1238,10 @@
 {
 	m_Selection->delaySignalsOff();
 	m_docUpdater->endUpdate();
+	// Ensure PP is properly disabled when selection is empty
+	// after undoing or redoing an action
+	if (m_Selection->count() == 0)
+		emit firstSelectedItemType(-1);
 }
 
 void ScribusDoc::restore(UndoState* state, bool isUndo)

Modified: branches/Version135/Scribus/scribus/selection.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15919&path=/branches/Version135/Scribus/scribus/selection.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/selection.cpp (original)
+++ branches/Version135/Scribus/scribus/selection.cpp Fri Nov 19 10:07:50 2010
@@ -317,7 +317,7 @@
 
 		if (m_SelList.isEmpty())
 			m_hasGroupSelection=false;
-		else if (m_isGUISelection)
+		if (m_isGUISelection)
 		{
 			m_sigSelectionChanged = true;
 			sendSignals();