r23572 by craig - Move setupMainWindow call to make Windows happy

[scribus-commit]

Author: craig
Date: Wed Apr  8 22:06:56 2020
New Revision: 23572

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23572
Log:
Move setupMainWindow call to make Windows happy

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23572&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Wed Apr  8 22:06:56 2020
@@ -394,7 +394,6 @@
 	connect( scrActions["windowsTile"], SIGNAL(triggered()) , mdiArea, SLOT(tileSubWindows()) );
 	initPalettes();
 
-	setupMainWindow();
 
 	viewToolBar->previewQualitySwitcher->setCurrentIndex(m_prefsManager.appPrefs.itemToolPrefs.imageLowResType);
 	if (primaryMainWindow)

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23572&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp	(original)
+++ trunk/Scribus/scribus/scribuscore.cpp	Wed Apr  8 22:06:56 2020
@@ -128,6 +128,8 @@
 	connect(ScQApp, SIGNAL(lastWindowClosed()), ScQApp, SLOT(quit()));
 
 	scribus->show();
+	scribus->setupMainWindow();
+
 	QStringList recoverFiles = scribus->findRecoverableFile();
 	int subsRet=scribus->ShowSubs();
 	if (subsRet==0)