r17509 by jghali - #10713: Crash on master pages when managing images

[scribus-commit]

Author: jghali
Date: Thu May 17 22:13:58 2012
New Revision: 17509

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17509
Log:
#10713: Crash on master pages when managing images

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

Modified: branches/Version14x/Scribus/scribus/picstatus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17509&path=/branches/Version14x/Scribus/scribus/picstatus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/picstatus.cpp (original)
+++ branches/Version14x/Scribus/scribus/picstatus.cpp Thu May 17 22:13:58 2012
@@ -377,7 +377,8 @@
 {
 	if (currItem != NULL)
 	{
-		ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
+		if (currItem->OnMasterPage.isEmpty() && currItem->doc()->masterPageMode())
+			ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
 		if (!currItem->OnMasterPage.isEmpty())
 			emit selectMasterPage(currItem->OnMasterPage);
 		else
@@ -390,7 +391,11 @@
 	if (currItem == NULL)
 		return;
 
-	ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
+	if (currItem->OnMasterPage.isEmpty() && currItem->doc()->masterPageMode())
+		ScCore->primaryMainWindow()->closeActiveWindowMasterPageEditor();
+	else if (!currItem->OnMasterPage.isEmpty() && !currItem->doc()->masterPageMode())
+		emit selectMasterPage(currItem->OnMasterPage);
+
 	if (currItem->Groups.count() == 0)
 		emit selectElement(currItem->OwnPage, currItem->ItemNr, false);
 	else