From a75338efae5b0c5610c42d9c243ae7c9b91538eb Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Sat, 13 Jan 2024 11:50:22 +0000
Subject: [PATCH 1/2] fwupdate: don't reset the watch after upload

Closes #3153.

Trace:
```
apps/fwupdate/custom.html:423: calls `sendCustomizedApp()`
core/lib/customize.js:63: send customised app
core/js/index.js:340: handle `"app"` message
core/js/index.js:356: call `uploadApp()`
core/js/comms.js:166: call `showUploadFinished()`
core/js/comms.js:24: reset watch (if autoReload is set)
```
---
 apps/fwupdate/custom.html | 2 +-
 core                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index 066d658be..3feab6591 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -426,7 +426,7 @@ function handleUpload() {
     storage:[
       {name:"RAM", content:hexJS},
     ]
-  });
+  }, true);
 }
 
 document.getElementById('fileLoader').addEventListener('change', handleFileSelect, false);
diff --git a/core b/core
index c97b7851f..3bbca52f3 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit c97b7851f50cfff4e898c2264a337a17085ce463
+Subproject commit 3bbca52f36237e92265749ee86069468460488a1

From fd0c46608af5221d8246630aab30013a30bf64b6 Mon Sep 17 00:00:00 2001
From: Rob Pilling <robpilling@gmail.com>
Date: Mon, 15 Jan 2024 20:53:10 +0000
Subject: [PATCH 2/2] fwupdate: pass { noFinish: true } for app

---
 apps/fwupdate/custom.html | 2 +-
 core                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/fwupdate/custom.html b/apps/fwupdate/custom.html
index 3feab6591..a5f96d98d 100644
--- a/apps/fwupdate/custom.html
+++ b/apps/fwupdate/custom.html
@@ -426,7 +426,7 @@ function handleUpload() {
     storage:[
       {name:"RAM", content:hexJS},
     ]
-  }, true);
+  }, { noFinish: true });
 }
 
 document.getElementById('fileLoader').addEventListener('change', handleFileSelect, false);
diff --git a/core b/core
index 3bbca52f3..41e586e3b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 3bbca52f36237e92265749ee86069468460488a1
+Subproject commit 41e586e3bb1025253ebdaa27a6be32e19619837f