From fc8306dde1aa0ae569d2ee8c7f4e4234b91e6854 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 8 Mar 2020 14:58:42 -0700
Subject: [PATCH] Android: Ensure we forget the shortcut on next run.

Prevents an issue where we would use the shortcut param again when
starting the app directly.
---
 Core/HLE/sceIo.cpp                                | 1 +
 UI/NativeApp.cpp                                  | 1 +
 android/src/org/ppsspp/ppsspp/PpssppActivity.java | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
index 7f2ea0afa9..a27b35e6d1 100644
--- a/Core/HLE/sceIo.cpp
+++ b/Core/HLE/sceIo.cpp
@@ -2732,6 +2732,7 @@ static int IoAsyncFinish(int id) {
 
 		default:
 			ERROR_LOG_REPORT(SCEIO, "Unknown async op %d", params.op);
+			us = 0;
 			break;
 		}
 
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index e47ff1117d..7cf11f7c29 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -538,6 +538,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	const char *stateToLoad = 0;
 
 	bool gotBootFilename = false;
+	boot_filename = "";
 
 	// Parse command line
 	LogTypes::LOG_LEVELS logLevel = LogTypes::LINFO;
diff --git a/android/src/org/ppsspp/ppsspp/PpssppActivity.java b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
index f96705dd97..f6496168b8 100644
--- a/android/src/org/ppsspp/ppsspp/PpssppActivity.java
+++ b/android/src/org/ppsspp/ppsspp/PpssppActivity.java
@@ -88,6 +88,7 @@ public class PpssppActivity extends NativeActivity {
 				super.setShortcutParam(getIntent().getStringExtra(SHORTCUT_EXTRA_KEY));
 			} else {
 				Log.e(TAG, "Shortcut missing parameter!");
+				super.setShortcutParam("");
 			}
 		}
 		super.onCreate(savedInstanceState);