r19275 by jghali - #12429: Undo/Redo crashes Scribus undoing Page > Delete...

[scribus-commit]

Author: jghali
Date: Tue Jun 24 16:43:52 2014
New Revision: 19275

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

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

Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19275&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Tue Jun 24 16:43:52 2014
@@ -8683,6 +8683,7 @@
 		where = 1;
 		wo = pagenr - 1;
 	}
+
 	if (isUndo)
 	{
 		if (savedMasterPageMode)
@@ -8708,8 +8709,9 @@
 	if (currMasterPageMode!=savedMasterPageMode)
 		doc->setMasterPageMode(currMasterPageMode);
 	doc->rebuildMasterNames();
-	ActWin->masterPagesPalette()->updateMasterPageList();
-	pagePalette->rebuildMasters();        
+	if (ActWin->masterPagesPalette())
+		ActWin->masterPagesPalette()->updateMasterPageList();
+	pagePalette->rebuildMasters();
 	pagePalette->rebuildPages();
 	if (outlinePalette->isVisible())
 		outlinePalette->BuildTree();