Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Fixed a watch eval race condition necessary for scripting

Browse source
This commit is contained in:
Brian Fiete 2019-11-07 06:53:32 -08:00
parent b2ca0e358b
commit d6db6bf774
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
IDE/src/ui/WatchPanel.bf
View file

@ -781,7 +781,7 @@ namespace IDE.ui
public class WatchListViewItem : IDEListViewItem public class WatchListViewItem : IDEListViewItem
{ {
IWatchOwner mWatchOwner; public IWatchOwner mWatchOwner;
public WatchEntry mWatchEntry ~ delete _; public WatchEntry mWatchEntry ~ delete _;
public bool mFailed; public bool mFailed;
public int32 mErrorStart; public int32 mErrorStart;
@ -802,6 +802,7 @@ namespace IDE.ui
public WatchRefreshButton mWatchRefreshButton; public WatchRefreshButton mWatchRefreshButton;
public ActionButton mActionButton; public ActionButton mActionButton;
public String mTextAction ~ delete _; public String mTextAction ~ delete _;
public bool mMustUpdateBeforeEvaluate;
public override bool Selected public override bool Selected
{ {
@ -1057,6 +1058,11 @@ namespace IDE.ui
if (mParentItem.mChildAreaHeight == 0) if (mParentItem.mChildAreaHeight == 0)
return; return;
if (mMustUpdateBeforeEvaluate)
{
Update();
}
if (!IsVisible(g)) if (!IsVisible(g))
return; return;
@ -1181,6 +1187,8 @@ namespace IDE.ui
public override void Update() public override void Update()
{ {
mMustUpdateBeforeEvaluate = false;
if ((mWatchEntry != null) && (mWatchEntry.mIsPending)) if ((mWatchEntry != null) && (mWatchEntry.mIsPending))
{ {
if (!gApp.mDebugger.mIsRunning) if (!gApp.mDebugger.mIsRunning)
@ -1311,6 +1319,9 @@ namespace IDE.ui
if ((forceDelete) || if ((forceDelete) ||
((wantsDelete) && (idx != 0) && (curWatchListViewItem != null) && (curWatchListViewItem.mChildAreaHeight == 0) && (!curWatchListViewItem.mIsSelected))) ((wantsDelete) && (idx != 0) && (curWatchListViewItem != null) && (curWatchListViewItem.mChildAreaHeight == 0) && (!curWatchListViewItem.mIsSelected)))
{ {
if (curWatchListViewItem == nextWatchListViewItem)
nextWatchListViewItem = null;
curMemberIdx--; curMemberIdx--;
mParentItem.RemoveChildItem(curWatchListViewItem); mParentItem.RemoveChildItem(curWatchListViewItem);
curWatchListViewItem = null; curWatchListViewItem = null;
@ -1747,11 +1758,10 @@ namespace IDE.ui
listViewItem.mWatchEntry = watchEntry; listViewItem.mWatchEntry = watchEntry;
} }
public void AddWatchItem(String name) public WatchListViewItem AddWatchItem(String name)
{ {
// This is the public interface to AddWatch, which uses the first available blank watch slot or appends a new one if necessary // This is the public interface to AddWatch, which uses the first available blank watch slot or appends a new one if necessary
var rootItem = mListView.GetRoot(); var rootItem = mListView.GetRoot();
bool added = false;
int childCount = mListView.GetRoot().GetChildCount(); int childCount = mListView.GetRoot().GetChildCount();
for (int iChild=0; iChild<childCount; ++iChild) for (int iChild=0; iChild<childCount; ++iChild)
{ {
@ -1766,13 +1776,10 @@ namespace IDE.ui
rootItem.SelectItemExclusively(listViewItem); rootItem.SelectItemExclusively(listViewItem);
mListView.EnsureItemVisible(listViewItem, true); mListView.EnsureItemVisible(listViewItem, true);
added = true; return listViewItem;
break;
}
if (!added)
{
AddWatch(name);
} }
return AddWatch(name);
} }
WatchListViewItem AddWatch(String name, String evalStr = null, ListViewItem parentItem = null) WatchListViewItem AddWatch(String name, String evalStr = null, ListViewItem parentItem = null)
@ -2376,6 +2383,9 @@ namespace IDE.ui
memberCount++; memberCount++;
} }
} }
// We update here to avoid doing a Draw with old series information (such as addresses)
memberItem.mMustUpdateBeforeEvaluate = true;
} }
else if (memberVals0 == ":addrs") else if (memberVals0 == ":addrs")
{ {