From 0587df4aa5f2977350cc80b1522cdc1e483c4515 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Tue, 1 Oct 2019 14:55:54 +0200
Subject: [PATCH] Fixed running the export templates with newer emscripten
 versions.

(cherry picked from commit 6f1d6cfc7815d753bb073e55191decb0520965f9)
---
 misc/dist/html/fixed-size.html |  3 ++-
 misc/dist/html/full-size.html  |  3 ++-
 platform/javascript/engine.js  | 13 +++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/misc/dist/html/fixed-size.html b/misc/dist/html/fixed-size.html
index 14766e8239c..1cc6fd715eb 100644
--- a/misc/dist/html/fixed-size.html
+++ b/misc/dist/html/fixed-size.html
@@ -229,6 +229,7 @@ $GODOT_HEAD_INCLUDE
 
 		(function() {
 
+			const EXECUTABLE_NAME = '$GODOT_BASENAME';
 			const MAIN_PACK = '$GODOT_BASENAME.pck';
 			const DEBUG_ENABLED = $GODOT_DEBUG_ENABLED;
 			const INDETERMINATE_STATUS_STEP_MS = 100;
@@ -380,7 +381,7 @@ $GODOT_HEAD_INCLUDE
 			} else {
 				setStatusMode('indeterminate');
 				engine.setCanvas(canvas);
-				engine.startGame(MAIN_PACK).then(() => {
+				engine.startGame(EXECUTABLE_NAME, MAIN_PACK).then(() => {
 					setStatusMode('hidden');
 					initializing = false;
 				}, displayFailureNotice);
diff --git a/misc/dist/html/full-size.html b/misc/dist/html/full-size.html
index 12b9af21e5b..9269227d027 100644
--- a/misc/dist/html/full-size.html
+++ b/misc/dist/html/full-size.html
@@ -142,6 +142,7 @@ $GODOT_HEAD_INCLUDE
 
 		(function() {
 
+			const EXECUTABLE_NAME = '$GODOT_BASENAME';
 			const MAIN_PACK = '$GODOT_BASENAME.pck';
 			const INDETERMINATE_STATUS_STEP_MS = 100;
 
@@ -254,7 +255,7 @@ $GODOT_HEAD_INCLUDE
 			} else {
 				setStatusMode('indeterminate');
 				engine.setCanvas(canvas);
-				engine.startGame(MAIN_PACK).then(() => {
+				engine.startGame(EXECUTABLE_NAME, MAIN_PACK).then(() => {
 					setStatusMode('hidden');
 					initializing = false;
 				}, displayFailureNotice);
diff --git a/platform/javascript/engine.js b/platform/javascript/engine.js
index 860d6707ff2..1f78aa672de 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 {