fix debugger not showing where error log occured

eez-open · Nov 10, 2024 · b5bfb5e · b5bfb5e
1 parent 0c49f97
commit b5bfb5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/project-editor/flow/runtime-viewer/viewer.tsx b/packages/project-editor/flow/runtime-viewer/viewer.tsx
@@ -528,6 +528,7 @@ export const Canvas = observer(
             }
 
             const lvglCreateInProgress =
+                !runtime.isStopped &&
                 this.props.flowContext.flowState &&
                 this.props.flowContext.flowState.flow instanceof
                     ProjectEditor.PageClass &&

diff --git a/packages/project-editor/flow/runtime/remote-runtime.ts b/packages/project-editor/flow/runtime/remote-runtime.ts
@@ -1371,10 +1371,11 @@ export abstract class DebuggerConnectionBase {
                             runtime.error = errorMessage;
                         });
 
-                        runtime.stopRuntime(true);
-
                         const { flowIndex, flowState } =
                             this.getFlowState(flowStateIndex);
+
+                        runtime.stopRuntime(true);
+
                         if (!flowState) {
                             console.error("UNEXPECTED!");
                             return;