3 files changed, 8 insertions, 9 deletions
diff --git a/platform/javascript/api/api.cpp b/platform/javascript/api/api.cpp
index d4dc43d57c..0832ae0360 100644
--- a/platform/javascript/api/api.cpp
+++ b/platform/javascript/api/api.cpp
@@ -55,7 +55,7 @@ JavaScript *JavaScript::get_singleton() {
 
 JavaScript::JavaScript() {
 
-	ERR_FAIL_COND(singleton != NULL);
+	ERR_FAIL_COND_MSG(singleton != NULL, "JavaScript singleton already exist.");
 	singleton = this;
 }
 
diff --git a/platform/javascript/engine.js b/platform/javascript/engine.js
index 860d6707ff..1f78aa672d 100644
--- a/platform/javascript/engine.js
+++ b/platform/javascript/engine.js
@@ -94,6 +94,7 @@
 			return new Promise(function(resolve, reject) {
 				rtenvProps.onRuntimeInitialized = resolve;
 				rtenvProps.onAbort = reject;
+				rtenvProps.thisProgram = executableName;
 				rtenvProps.engine.rtenv = Engine.RuntimeEnvironment(rtenvProps, LIBS);
 			});
 		}
@@ -130,13 +131,11 @@
 			);
 		};
 
-		this.startGame = function(mainPack) {
+		this.startGame = function(execName, mainPack) {
+
+			executableName = execName;
+			var mainArgs = [ '--main-pack', mainPack ];
 
-			executableName = getBaseName(mainPack);
-			var mainArgs = [];
-			if (!getPathLeaf(mainPack).endsWith('.pck')) {
-				mainArgs = ['--main-pack', getPathLeaf(mainPack)];
-			}
 			return Promise.all([
 				// Load from directory,
 				this.init(getBasePath(mainPack)),
@@ -187,8 +186,6 @@
 			this.rtenv.locale = this.rtenv.locale.split('.')[0];
 			this.rtenv.resizeCanvasOnStart = resizeCanvasOnStart;
 
-			this.rtenv.thisProgram = executableName || getBaseName(basePath);
-
 			preloadedFiles.forEach(function(file) {
 				var dir = LIBS.PATH.dirname(file.path);
 				try {
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index 0179bf813d..b0661cb4dd 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -574,6 +574,8 @@ void OS_JavaScript::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_s
 		}, cursors[p_shape].utf8().get_data());
 		/* clang-format on */
 		cursors[p_shape] = "";
+
+		cursors_cache.erase(p_shape);
 	}
 
 	set_cursor_shape(cursor_shape);