Skip to content

Commit 22bc933

Browse files
committed
Do not clear watch panel after each debugging session.
1 parent 6e32087 commit 22bc933

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

External/Plugins/FlashDebugger/Controls/WatchUI.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ private DataNode GetExpressionNode(string item)
9494
DataNode node;
9595
try
9696
{
97+
if (!PluginMain.debugManager.FlashInterface.isDebuggerStarted)
98+
{
99+
return new ErrorNode(item, new Exception(""));
100+
}
101+
97102
IASTBuilder builder = new ASTBuilder(false);
98103
ValueExp exp = builder.parse(new java.io.StringReader(item));
99104
var ctx = new ExpressionContext(PluginMain.debugManager.FlashInterface.Session, PluginMain.debugManager.FlashInterface.GetFrames()[PluginMain.debugManager.CurrentFrame]);

External/Plugins/FlashDebugger/Debugger/DebuggerManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ private void flashInterface_DisconnectedEvent(object sender)
384384
}
385385
PanelsHelper.localsUI.TreeControl.Nodes.Clear();
386386
PanelsHelper.stackframeUI.ClearItem();
387-
PanelsHelper.watchUI.Clear();
387+
PanelsHelper.watchUI.UpdateElements();
388388
PanelsHelper.threadsUI.ClearItem();
389389
PluginMain.breakPointManager.ResetAll();
390390
PluginBase.MainForm.ProgressBar.Visible = false;

External/Plugins/FlashDebugger/PluginMain.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,12 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
166166
if (project != null && project.EnableInteractiveDebugger)
167167
{
168168
disableDebugger = false;
169-
PanelsHelper.breakPointUI.Clear();
170169
if (breakPointManager.Project != null && breakPointManager.Project != project)
171170
{
172171
breakPointManager.Save();
173172
}
173+
PanelsHelper.breakPointUI.Clear();
174+
PanelsHelper.watchUI.Clear();
174175
breakPointManager.Project = project;
175176
breakPointManager.Load();
176177
breakPointManager.SetBreakPointsToEditor(PluginBase.MainForm.Documents);
@@ -183,6 +184,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
183184
breakPointManager.Save();
184185
}
185186
PanelsHelper.breakPointUI.Clear();
187+
PanelsHelper.watchUI.Clear();
186188
}
187189
}
188190
else if (disableDebugger) return;

0 commit comments

Comments
 (0)