r17775 by jghali - #9098: node palette disappears

[scribus-commit]

Author: jghali
Date: Thu Sep 20 20:47:05 2012
New Revision: 17775

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17775
Log:
#9098: node palette disappears

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17775&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Sep 20 20:47:05 2012
@@ -2150,14 +2150,12 @@
 {
 	if (w == NULL)
 	{
-		if ( mdiArea->subWindowList().count() == 0)
+		if (mdiArea->subWindowList().count() == 0)
 			ActWin = NULL;
 		return;
 	}
 	if (w->widget() == NULL)
 		return;
-	if (doc!=0 && doc->appMode == modeEditClip)
-		view->requestMode(submodeEndNodeEdit);
 	ScribusWin* scw = dynamic_cast<ScribusWin *>(w->widget());
 	if (!scw)
 		return;
@@ -2166,14 +2164,16 @@
 		if (!scw->doc()->hasGUI())
 			return;
 	}
-	if(scw == ActWin)
+	if (scw == ActWin)
 		return;
 	ActWin = scw;
-	if (ActWin->doc()==NULL)
+	if (ActWin->doc() == NULL)
 		return;
 
 	if (doc != NULL)
 	{
+		if (doc->appMode == modeEditClip)
+			view->requestMode(submodeEndNodeEdit);
 		if ((HaveDoc) && (doc != ActWin->doc()))
 			outlinePalette->buildReopenVals();
 	}