194146 - CVSUIPlugin.stop not being called (3.3.1)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
index 44b7570..a7510ce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/Display.java
@@ -841,15 +841,17 @@
Event event = new Event ();
sendEvent (SWT.Close, event);
if (event.doit) {
+ dispose ();
/*
* When the application is closing, no SWT program can continue
* to run. In order to avoid running code after the display has
* been disposed, exit from Java.
*/
- dispose ();
- System.exit (0);
+ /* This code is intentionally commented */
+// System.exit (0);
+ } else {
+ return OS.userCanceledErr;
}
- return OS.userCanceledErr;
}
return OS.noErr;
}
