r19214 by jghali - #12375: Undo/Redo crashes Scribus editing a Freehand Line

scribus-commit scribus-commit at lists.scribus.net
Thu Jun 12 16:49:19 UTC 2014


Author: jghali
Date: Thu Jun 12 16:49:18 2014
New Revision: 19214

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19214
Log:
#12375: Undo/Redo crashes Scribus editing a Freehand Line

Modified:
    branches/Version14x/Scribus/scribus/page.cpp

Modified: branches/Version14x/Scribus/scribus/page.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19214&path=/branches/Version14x/Scribus/scribus/page.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/page.cpp (original)
+++ branches/Version14x/Scribus/scribus/page.cpp Thu Jun 12 16:49:18 2014
@@ -214,12 +214,9 @@
 	int stateCode = state->transactionCode;
 	PageItem *ite = state->getItem();
 	bool oldMPMode=m_Doc->masterPageMode();
-	if ((stateCode == 0) || (stateCode == 1))
-	{
-		m_Doc->setMasterPageMode(!ite->OnMasterPage.isEmpty());
-		if (m_Doc->appMode == modeEditClip) // switch off from edit shape
-			m_Doc->scMW()->nodePalette->EndEdit();
-	}
+	m_Doc->setMasterPageMode(!ite->OnMasterPage.isEmpty());
+	if (m_Doc->appMode == modeEditClip) // switch off from edit shape
+		m_Doc->scMW()->nodePalette->EndEdit();
 	m_Doc->m_Selection->delaySignalsOn();
 	if (isUndo)
 	{




More information about the scribus-commit mailing list