aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorEugene Sandulenko2015-11-11 21:36:27 +0100
committerEugene Sandulenko2015-11-11 21:36:27 +0100
commit8360d3cd6f4e4beeb6564363a49e9b4a0de64b15 (patch)
treeebffec062e7112b0b9471396a64f038ae3c954b6 /gui
parent18bc506a210889f1592ba95f66871b6935c1e37f (diff)
downloadscummvm-rg350-8360d3cd6f4e4beeb6564363a49e9b4a0de64b15.tar.gz
scummvm-rg350-8360d3cd6f4e4beeb6564363a49e9b4a0de64b15.tar.bz2
scummvm-rg350-8360d3cd6f4e4beeb6564363a49e9b4a0de64b15.zip
GUI: Do not show splash when ran from launcher
Diffstat (limited to 'gui')
-rw-r--r--gui/gui-manager.cpp2
-rw-r--r--gui/gui-manager.h2
-rw-r--r--gui/launcher.cpp2
3 files changed, 6 insertions, 0 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 9b6cf5a0b6..20c6d3fa13 100644
--- 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
index 4186a93ccb..26c8d6def9 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -98,6 +98,8 @@ public:
*/
bool checkScreenChange();
+ bool _launched;
+
protected:
enum RedrawStatus {
kRedrawDisabled = 0,
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 5abf0aba26..bae894cba1 100644
--- 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) {