Skip to content

Commit

Permalink
pyocd: some cleanup of messages for async jobs
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Reed <flit@me.com>
  • Loading branch information
flit committed Jan 5, 2021
1 parent 3ffebec commit e7114e0
Showing 1 changed file with 4 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,6 @@ protected void handleCompleted() {
}
else {
clearPyocdErrors(true);
setMessage(null);

assert(probes != null);

Expand Down Expand Up @@ -1355,8 +1354,9 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
fProbes = probes;

selectActiveProbe();

updatePyocdLoadingMessage();

updatePyocdLoadingMessage();
scheduleUpdateJob();

return Status.OK_STATUS;
}
Expand Down Expand Up @@ -1431,7 +1431,6 @@ protected void handleCompleted() {
}
else {
clearPyocdErrors(false);
setMessage(null);

List<PyOCD.Target> targets = getData();
assert(targets != null);
Expand Down Expand Up @@ -1471,12 +1470,12 @@ public IStatus runInUIThread(IProgressMonitor monitor) {
// Select current target from config.
selectActiveTarget();

scheduleUpdateJob();
if (fNeedsDefaultTargetNameRefresh) {
selectActiveProbe();
}

updatePyocdLoadingMessage();
scheduleUpdateJob();

return Status.OK_STATUS;
}
Expand Down

0 comments on commit e7114e0

Please sign in to comment.