r16185 by craig - Add in missing changes to startup for help browser opening

[scribus-commit]

Author: craig
Date: Thu Dec 30 14:02:55 2010
New Revision: 16185

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16185
Log:
Add in missing changes to startup for help browser opening

Modified:
    trunk/Scribus/scribus/scribuscore.cpp

Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16185&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Thu Dec 30 14:02:55 2010
@@ -116,20 +116,27 @@
 	connect(ScQApp, SIGNAL(lastWindowClosed()), ScQApp, SLOT(quit()));
 
 	scribus->show();
-	scribus->ShowSubs();
-
-	if (!m_Files.isEmpty())
-	{
-		for (int i = 0; i < m_Files.size(); ++i)
-			scribus->loadDoc(m_Files.at(i));
-	}
-	else
-	{
-		if (PrefsManager::instance()->appPrefs.uiPrefs.showStartupDialog)
-			scribus->startUpDialog();
+	int subsRet=scribus->ShowSubs();
+	if (subsRet==0)
+	{
+		if (!m_Files.isEmpty())
+		{
+			for (int i = 0; i < m_Files.size(); ++i)
+				scribus->loadDoc(m_Files.at(i));
+		}
 		else
-			scribus->setFocus();
-	}
+		{
+			if (PrefsManager::instance()->appPrefs.uiPrefs.showStartupDialog)
+				scribus->startUpDialog();
+			else
+				scribus->setFocus();
+		}
+	}
+	else if (subsRet==QMessageBox::Help)
+	{
+		scribus->slotRaiseOnlineHelp();
+	}
+
 	qApp->setOverrideCursor(QCursor(Qt::ArrowCursor));
 
 	// A hook for plugins and scripts to trigger on. Some plugins and scripts