r19215 by jghali - #12375: Undo/Redo crashes Scribus editing a Freehand Line
scribus-commit
scribus-commit at lists.scribus.net
Thu Jun 12 16:50:05 UTC 2014
Author: jghali
Date: Thu Jun 12 16:50:04 2014
New Revision: 19215
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19215
Log:
#12375: Undo/Redo crashes Scribus editing a Freehand Line
Modified:
trunk/Scribus/scribus/scpage.cpp
Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19215&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp (original)
+++ trunk/Scribus/scribus/scpage.cpp Thu Jun 12 16:50:04 2014
@@ -321,12 +321,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