r19284 by jghali - #12436: Undo/Redo crashes Scribus undoing Page > Insert...

[scribus-commit]

Author: jghali
Date: Thu Jun 26 16:41:00 2014
New Revision: 19284

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19284
Log:
#12436: Undo/Redo crashes Scribus undoing Page > Insert...

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

Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19284&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Thu Jun 26 16:41:00 2014
@@ -8791,7 +8791,8 @@
 	if (currMasterPageMode!=savedMasterPageMode)
 		doc->setMasterPageMode(currMasterPageMode);
 	doc->rebuildMasterNames();
-	ActWin->masterPagesPalette()->updateMasterPageList();
+	if (ActWin->masterPagesPalette())
+		ActWin->masterPagesPalette()->updateMasterPageList();
 	pagePalette->rebuildPages();
 	if (outlinePalette->isVisible())
 		outlinePalette->BuildTree();