mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-30 21:55:31 +02:00
[206561] Added call to RequestMonitor.cancel() when the view model is found to be canceled, to avoid an assertion error in RequestMonitor.
This commit is contained in:
parent
6a50faf14a
commit
d36e8f3b7c
1 changed files with 2 additions and 5 deletions
|
@ -150,11 +150,7 @@ public class VMViewerUpdate implements IViewerUpdate {
|
|||
public TreePath getElementPath() { return fElementPath; }
|
||||
public IPresentationContext getPresentationContext() { return fPresentationContext; }
|
||||
public IStatus getStatus() { return fRequestMonitor.getStatus(); }
|
||||
public void setStatus(IStatus status) {
|
||||
if ( isCanceled() ) {
|
||||
fRequestMonitor.cancel();
|
||||
}
|
||||
fRequestMonitor.setStatus(status); }
|
||||
public void setStatus(IStatus status) { fRequestMonitor.setStatus(status); }
|
||||
|
||||
public boolean isCanceled() {
|
||||
if (fClientUpdate != null) {
|
||||
|
@ -174,6 +170,7 @@ public class VMViewerUpdate implements IViewerUpdate {
|
|||
public void done() {
|
||||
try {
|
||||
if ( isCanceled() ) {
|
||||
fRequestMonitor.cancel();
|
||||
fRequestMonitor.setStatus(new Status( IStatus.CANCEL, DsfUIPlugin.PLUGIN_ID," Update was cancelled") ); //$NON-NLS-1$
|
||||
}
|
||||
fRequestMonitor.done();
|
||||
|
|
Loading…
Add table
Reference in a new issue