GUI: Do not show splash when ran from launcher

scummvm · Nov 11, 2015 · 8360d3c · 8360d3c
1 parent 18bc506
commit 8360d3c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/engines/engine.cpp b/engines/engine.cpp
@@ -50,6 +50,7 @@
 
 #include "backends/keymapper/keymapper.h"
 
+#include "gui/gui-manager.h"
 #include "gui/debugger.h"
 #include "gui/dialog.h"
 #include "gui/message.h"
@@ -303,7 +304,7 @@ void initGraphics(int width, int height, bool defaultTo1xScaler, const Graphics:
 
 	OSystem::TransactionError gfxError = g_system->endGFXTransaction();
 
-	if (!splash)
+	if (!splash && !GUI::GuiManager::instance()._launched)
 		splashScreen();
 
 	if (gfxError == OSystem::kTransactionSuccess)

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
@@ -64,6 +64,8 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
 	_width = _system->getOverlayWidth();
 	_height = _system->getOverlayHeight();
 
+	_launched = false;
+
 	// Clear the cursor
 	memset(_cursor, 0xFF, sizeof(_cursor));
 

diff --git a/gui/gui-manager.h b/gui/gui-manager.h
@@ -98,6 +98,8 @@ class GuiManager : public Common::Singleton<GuiManager> {
 	 */
 	bool checkScreenChange();
 
+	bool _launched;
+
 protected:
 	enum RedrawStatus {
 		kRedrawDisabled = 0,

diff --git a/gui/launcher.cpp b/gui/launcher.cpp
@@ -683,6 +683,8 @@ LauncherDialog::LauncherDialog()
 
 	// Create Load dialog
 	_loadDialog = new SaveLoadChooser(_("Load game:"), _("Load"), false);
+
+	GUI::GuiManager::instance()._launched = true;
 }
 
 void LauncherDialog::selectTarget(const String &target) {