Skip to content

Commit cb1479c

Browse files
committed
fix: prevent debug scan button getting stuck and block premature modal close
1 parent 48ed042 commit cb1479c

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

app.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@ func (a *App) SubmitTestResult(success bool) {
914914
func (a *App) CancelScan() {
915915
a.mu.Lock()
916916
a.ScanCancelled = true
917+
a.ActiveScan = false
917918
a.mu.Unlock()
918919

919920
select {

frontend/dist/src/main.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ let projectModified = false;
22
let projectFilePath = "";
33
let currentTheme = "dark";
44
let syncActive = false;
5+
let testDialogActive = false;
56

67
function log(message, level) {
78
const area = document.getElementById("log-area");
@@ -33,9 +34,12 @@ function closeModal() {
3334
document.getElementById("modal-overlay").classList.add("hidden");
3435
}
3536

36-
document.getElementById("modal-close-btn").addEventListener("click", closeModal);
37+
document.getElementById("modal-close-btn").addEventListener("click", function() {
38+
if (testDialogActive) return;
39+
closeModal();
40+
});
3741
document.getElementById("modal-overlay").addEventListener("click", function(e) {
38-
if (e.target === this) closeModal();
42+
if (e.target === this && !testDialogActive) closeModal();
3943
});
4044

4145
async function showInfo(title, message) {
@@ -164,6 +168,7 @@ window.runtime.EventsOn("close-confirm", function() {
164168
});
165169

166170
function showTestDialog(count) {
171+
testDialogActive = true;
167172
showModal("Test Launch",
168173
'<div class="test-dialog-main">' +
169174
'<h2>Testing ' + count + ' mods</h2>' +
@@ -177,13 +182,16 @@ function showTestDialog(count) {
177182
}
178183

179184
function submitTestResult(success) {
185+
testDialogActive = false;
180186
closeModal();
181187
window.go.main.App.SubmitTestResult(success);
182188
}
183189

184190
async function cancelDebug() {
185191
await window.go.main.App.CancelScan();
192+
testDialogActive = false;
186193
closeModal();
194+
await updateUI();
187195
}
188196

189197
// Theme

0 commit comments

Comments
 (0)