0
@@ -1335,8 +1335,15 @@ CPTexturedBackgroundWindowMask
0
 */
0
 - (void)performClose:(id)aSender
0
 {
0
-    if ([_delegate respondsToSelector:@selector(windowShouldClose:)] && ![_delegate windowShouldClose:self] ||
0
-        [self respondsToSelector:@selector(windowShouldClose:)] && ![self windowShouldClose:self])
0
+    // Only send ONE windowShouldClose: message.
0
+    if ([_delegate respondsToSelector:@selector(windowShouldClose:)])
0
+    {
0
+        if (![_delegate windowShouldClose:self])
0
+            return;
0
+    }
0
+    
0
+    // Only check self is delegate does NOT implement this.  This also ensures this when delegate == self (returns true).
0
+    else if ([self respondsToSelector:@selector(windowShouldClose:)] && ![self windowShouldClose:self])
0
         return;
0
     
0
     [self close];

0
@@ -52,10 +52,8 @@ function objj_exception_setOutputStream(aStream)
0
     OBJJ_EXCEPTION_OUTPUT_STREAM = aStream;
0
 }
0
 
0
-#if COMPILER
0
-importPackage(java.lang);
0
-
0
-objj_exception_setOutputStream(function (aString) { System.out.println(aString) } );
0
+#if RHINO
0
+objj_exception_setOutputStream(warning_stream);
0
 #elif DEBUG
0
 if (window.console && window.console.error)
0
     objj_exception_setOutputStream(function (aString) { console.error(aString) } );