194146 - CVSUIPlugin.stop not being called

2 files changed, 7 insertions, 4 deletions

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 4c7de0fe88..7220081d15 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
@@ -844,15 +844,17 @@ int coreEventProc (int theAppleEvent, int reply, int handlerRefcon) {
 		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;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
index 0ea34a6df8..a61d6593db 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
@@ -2984,7 +2984,8 @@ int /*long*/ messageProc (int /*long*/ hwnd, int /*long*/ msg, int /*long*/ wPar
 				* to run.  In order to avoid running code after the display
 				* has been disposed, exit from Java.
 				*/
-				System.exit (0);
+				/* This code is intentionally commented */
+//				System.exit (0);
 			}
 			break;
 		}