Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Rennie2006-10-13 19:29:02 +0000
committerMichael Rennie2006-10-13 19:29:02 +0000
commitca5a8ad28549c56e269dc09c3ca1168ae0cf92b6 (patch)
tree0d81e5e6b4a8f942d94785b57520cce2156ae546
parente6e9fcc73df9defba69f40d44811f39379b77c73 (diff)
downloadeclipse.platform.debug-ca5a8ad28549c56e269dc09c3ca1168ae0cf92b6.tar.gz
eclipse.platform.debug-ca5a8ad28549c56e269dc09c3ca1168ae0cf92b6.tar.xz
eclipse.platform.debug-ca5a8ad28549c56e269dc09c3ca1168ae0cf92b6.zip
Bug 151700
assertion failed when searching for main removed unecessary if statement
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java20
1 files changed, 9 insertions, 11 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
index f3c09ca65..47e430b27 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
@@ -1211,18 +1211,16 @@ public class LaunchConfigurationsDialog extends TitleAreaDialog implements ILaun
*/
public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException {
if (getShell() != null && getShell().isVisible()) {
- if (getShell() != null) {
- // Save focus control
- fLastControl = getShell().getDisplay().getFocusControl();
- if (fLastControl != null && fLastControl.getShell() != getShell()) {
- fLastControl = null;
- }
- fProgressMonitorCancelButton.setEnabled(true);
- // Attach the progress monitor part to the cancel button
- fProgressMonitorPart.attachToCancelComponent(fProgressMonitorCancelButton);
- fProgressMonitorPart.getParent().setVisible(true);
- fProgressMonitorCancelButton.setFocus();
+ // Save focus control
+ fLastControl = getShell().getDisplay().getFocusControl();
+ if (fLastControl != null && fLastControl.getShell() != getShell()) {
+ fLastControl = null;
}
+ fProgressMonitorCancelButton.setEnabled(true);
+ // Attach the progress monitor part to the cancel button
+ fProgressMonitorPart.attachToCancelComponent(fProgressMonitorCancelButton);
+ fProgressMonitorPart.getParent().setVisible(true);
+ fProgressMonitorCancelButton.setFocus();
fActiveRunningOperations++;
try {
ModalContext.run(runnable, fork, fProgressMonitorPart, getShell().getDisplay());

Back to the top