r18798 by fschmid - Fixed Bug #12035: "XPS Import" window crashes changing its size and then closing it

[scribus-commit]

Author: fschmid
Date: Wed Feb  5 20:27:04 2014
New Revision: 18798

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18798
Log:
Fixed Bug #12035: "XPS Import" window crashes changing its size and then closing it

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18798&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Feb  5 20:27:04 2014
@@ -4045,7 +4045,9 @@
 	QList<QMdiSubWindow *> windows = mdiArea->subWindowList();
 	ScribusWin* ActWinOld = NULL;
 	if (windows.count() != 0)
+	{
 		ActWinOld = ActWin;
+	}
 
 	// PV - 5780: Scribus doesn't track what documents are already opened
 	// The goal of this part of code is to disallow user to open one
@@ -4150,6 +4152,7 @@
 			delete fileLoader;
 // 			delete view;
 			delete doc;
+			doc=NULL;
 			mdiArea->removeSubWindow(w->getSubWin());
 			delete w;
 			view=NULL;
@@ -4161,7 +4164,14 @@
 			ActWin = NULL;
 			undoManager->setUndoEnabled(true);
 			if (windows.count() != 0)
+			{
 				newActWin(ActWinOld->getSubWin());
+				if (ActWin)
+				{
+					if ((mdiArea->subWindowList().isEmpty()) || (mdiArea->subWindowList().count() == 1))
+						ActWin->showMaximized();
+				}
+			}
 			return false;
 		}
 		symbolPalette->setDoc(doc);