From e00819da592980386098490450364818f0b24b94 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Mon, 2 Aug 2021 14:04:56 -0500
Subject: [PATCH] fixed error when platform is invalid

---
 Makefile           |  3 ++-
 src/ide/embedui.ts |  4 ++--
 src/ide/ui.ts      | 12 +++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7b0710ea..9c849adb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ TSC=./node_modules/typescript/bin/tsc --build
 TMP=./tmp/dist
 
 buildtsc:
+	npm run esbuild-clean
 	$(TSC) tsconfig.json
 	npm run esbuild
 
@@ -25,7 +26,7 @@ prepare: buildtsc
 	cd jsnes && npm i
 	npm run mkdoc
 
-distro:
+distro: buildtsc
 	rm -fr $(TMP) && mkdir -p $(TMP)
 	git archive HEAD | tar x -C $(TMP)
 	cp -rp gen $(TMP)
diff --git a/src/ide/embedui.ts b/src/ide/embedui.ts
index 507f8feb..6b94d648 100644
--- a/src/ide/embedui.ts
+++ b/src/ide/embedui.ts
@@ -168,9 +168,9 @@ async function startPlatform(qs) {
 async function loadPlatform(qs) {
   if (qs.data) qs = qs.data;
   platform_id = qs['p'];
-  if (!platform_id) throw('No platform variable!');
-  var module = await importPlatform(getRootBasePlatform(platform_id));
+  if (!platform_id) throw new Error('No platform variable!');
   try {
+    var module = await importPlatform(getRootBasePlatform(platform_id));
     console.log("starting platform", platform_id); // loaded required <platform_id>.js file
     await startPlatform(qs);
   } catch (e) {
diff --git a/src/ide/ui.ts b/src/ide/ui.ts
index 526e410c..8bea583d 100644
--- a/src/ide/ui.ts
+++ b/src/ide/ui.ts
@@ -2355,18 +2355,16 @@ export async function startUI() {
 }
 
 async function loadAndStartPlatform() {
-  var module = await importPlatform(getRootBasePlatform(platform_id));
   try {
+    var module = await importPlatform(getRootBasePlatform(platform_id));
     console.log("starting platform", platform_id); // loaded required <platform_id>.js file
-    try {
-      await startPlatform();
-      document.title = document.title + " [" + platform_id + "] - " + (repo_id?('['+repo_id+'] - '):'') + current_project.mainPath;
-    } finally {
-      revealTopBar();
-    }
+    await startPlatform();
+    document.title = document.title + " [" + platform_id + "] - " + (repo_id?('['+repo_id+'] - '):'') + current_project.mainPath;
   } catch (e) {
     console.log(e);
     alertError('Platform "' + platform_id + '" failed to load.');
+  } finally {
+    revealTopBar();
   }
 }