From d75a007ef33cb928f41a92545270ff72e02ae442 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sat, 27 Jul 2013 13:07:34 +0200
Subject: [PATCH] Skip the startup logo when loading a game from the command
 line.

---
 UI/NativeApp.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index c4948b8c7a..884183d480 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -213,6 +213,7 @@ void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, boo
 
 void NativeInit(int argc, const char *argv[],
 								const char *savegame_directory, const char *external_directory, const char *installID) {
+	bool skipLogo = false;
 	EnableFZ();
 	setlocale( LC_ALL, "C" );
 	std::string user_data_path = savegame_directory;
@@ -299,6 +300,7 @@ void NativeInit(int argc, const char *argv[],
 		} else {
 			if (boot_filename.empty()) {
 				boot_filename = argv[i];
+				skipLogo = true;
 
 				FileInfo info;
 				if (!getFileInfo(boot_filename.c_str(), &info) || info.exists == false) {
@@ -380,7 +382,11 @@ void NativeInit(int argc, const char *argv[],
 #endif
 	}
 	
-	screenManager->switchScreen(new LogoScreen(boot_filename));
+	if (skipLogo) {
+		screenManager->switchScreen(new EmuScreen(boot_filename));
+	} else {
+		screenManager->switchScreen(new LogoScreen(boot_filename));
+	}
 }
 
 void NativeInitGraphics() {