From 5d85dee6f85796cc25495ff4d2d79b6fc20728b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Fri, 24 Nov 2023 20:13:29 +0100
Subject: [PATCH] Fixed #2131 Debugger - Breakpoints can be added while SWF is
 running (not just on pause)

---
 CHANGELOG.md                                  |  1 +
 .../decompiler/flash/gui/DebuggerHandler.java | 20 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d0623fc0..a129acde4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ All notable changes to this project will be documented in this file.
 - Retain AS3 script selection in the tree after its editation and saving whole SWF
 - [#2131] AS1/2 Debugger - Breakpoint handling - incorrect script names
 - [#2131] Debugger - Correct walking variables tree
+- [#2131] Debugger - Breakpoints can be added while SWF is running (not just on pause)
 
 ### Changed
 - [#2120] Exported assets no longer take names from assigned classes if there is more than 1 assigned class
diff --git a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
index 5914c7302..ee7e7db3f 100644
--- a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
+++ b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
@@ -213,7 +213,7 @@ public class DebuggerHandler implements DebugConnectionListener {
             toRemoveBPointMap.get(scriptName).add(line);
         }
         try {
-            sendBreakPoints(false);
+            sendBreakPoints();
         } catch (IOException ex) {
             //ignore
         }
@@ -310,12 +310,10 @@ public class DebuggerHandler implements DebugConnectionListener {
                 toAddBPointMap.put(scriptName, new TreeSet<>());
             }
             toAddBPointMap.get(scriptName).add(line);
-            Logger
-                    .getLogger(DebuggerHandler.class
-                            .getName()).log(Level.FINE, "bp {0}:{1} added to todo", new Object[]{scriptName, line});
+            Logger.getLogger(DebuggerHandler.class.getName()).log(Level.FINE, "bp {0}:{1} added to todo", new Object[]{scriptName, line});
         }
         try {
-            sendBreakPoints(false);
+            sendBreakPoints();
         } catch (IOException ex) {
             //ignored
         }
@@ -797,7 +795,7 @@ public class DebuggerHandler implements DebugConnectionListener {
 
                         Logger.getLogger(DebuggerHandler.class.getName()).log(Level.FINE, "break at {0}:{1}, reason: {2}", new Object[]{newBreakScriptName, message.line, reason});
 
-                        sendBreakPoints(false);
+                        sendBreakPoints();
                         synchronized (DebuggerHandler.this) {
                             breakScriptName = newBreakScriptName;
                             breakIp = message.line;
@@ -877,12 +875,12 @@ public class DebuggerHandler implements DebugConnectionListener {
         }
     }
 
-    private void sendBreakPoints(boolean force) throws IOException {
-        if (!force && !isPaused()) {
-            Logger.getLogger(DebuggerHandler.class.getName()).log(Level.FINEST, "not sending bps, not paused");
+    private void sendBreakPoints() throws IOException {
+        if (!isConnected()) {
+            Logger.getLogger(DebuggerHandler.class.getName()).log(Level.FINEST, "not sending bps, not connected");
             return;
-        }
-        synchronized (this) {
+        }                
+        synchronized (this) {                                   
             for (String scriptName : toRemoveBPointMap.keySet()) {
                 int file = moduleIdOf(scriptName);
                 if (file > -1) {