mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-05 15:25:49 +02:00
Bug 325394 - follow-up fix
This commit is contained in:
parent
3a5ca94dd2
commit
2d6e299347
1 changed files with 13 additions and 0 deletions
|
@ -741,6 +741,19 @@ public class DsfSourceDisplayAdapter implements ISourceDisplay, ISteppingControl
|
||||||
// If there is a previous lookup job running, cancel it.
|
// If there is a previous lookup job running, cancel it.
|
||||||
if (fRunningLookupJob != null) {
|
if (fRunningLookupJob != null) {
|
||||||
fRunningLookupJob.cancel();
|
fRunningLookupJob.cancel();
|
||||||
|
if (!eventTriggered && frameData.isIdentical(fRunningLookupJob.fFrameData)) {
|
||||||
|
// identical location - we are done
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// cancel running lookup job
|
||||||
|
fRunningLookupJob.cancel();
|
||||||
|
// make sure doneStepping() is called even if the job never ran - bug 325394
|
||||||
|
if (fRunningLookupJob.fEventTriggered) {
|
||||||
|
// ... but not if this request is event-triggered for the same context (duplicate suspended event)
|
||||||
|
if (!eventTriggered || !fRunningLookupJob.getDmc().equals(frameData.fDmc)) {
|
||||||
|
doneStepping(fRunningLookupJob.getDmc());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fRunningLookupJob = new LookupJob(frameData, page, eventTriggered);
|
fRunningLookupJob = new LookupJob(frameData, page, eventTriggered);
|
||||||
|
|
Loading…
Add table
Reference in a new issue