Merge pull request #2935 from Kingcom/AutoBootFix

Fix auto boot
hrydgard · Jul 26, 2013 · 98c5fba · thedax · Jul 26, 2013 · 98c5fba
2 parents 3c86141 + 87f13d9
commit 98c5fba
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
@@ -299,8 +299,9 @@ void NativeInit(int argc, const char *argv[],
 		} else {
 			if (boot_filename.empty()) {
 				boot_filename = argv[i];
-				if (!File::Exists(boot_filename))
-				{
+
+				FileInfo info;
+				if (!getFileInfo(boot_filename.c_str(), &info) || info.exists == false) {
 					fprintf(stderr, "File not found: %s\n", boot_filename.c_str());
 					exit(1);
 				}
@@ -376,14 +377,10 @@ void NativeInit(int argc, const char *argv[],
 		if (Atrac3plus_Decoder::CanAutoInstall()) {
 			Atrac3plus_Decoder::DoAutoInstall();
 		}
-		screenManager->switchScreen(new LogoScreen(boot_filename));
-#else
-		screenManager->switchScreen(new LogoScreen(boot_filename));
 #endif
-	} else {
-		// Go directly into the game.
-		screenManager->switchScreen(new EmuScreen(boot_filename));
 	}
+
+	screenManager->switchScreen(new LogoScreen(boot_filename));
 }
 
 void NativeInitGraphics() {