Merge branch 'godotengine:master' into master

godotengine · Nov 11, 2021 · b7445a7 · b7445a7
2 parents a900eaf + 363160e
commit b7445a7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/debugger/debug_session.ts b/src/debugger/debug_session.ts
@@ -298,7 +298,10 @@ export class GodotDebugSession extends LoggingDebugSession {
 			});
 			client_lines.forEach((l) => {
 				if (bp_lines.indexOf(l) === -1) {
-					this.debug_data.set_breakpoint(path, l);
+					let bp = args.breakpoints.find((bp_at_line) => (bp_at_line.line == l));
+					if (!bp.condition) {
+						this.debug_data.set_breakpoint(path, l);
+					}
 				}
 			});