Reviewed by Darin.

        Bug 9568: assertion failure in Safari after quitting Drosera
        http://bugzilla.opendarwin.org/show_bug.cgi?id=9568

        Call switchToServerNamed:nil and not removeLister to make sure
        the server object is set to nil to prevent further removeListener calls.

        * Drosera/DebuggerDocument.m:
        (-[DebuggerDocument applicationTerminating:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15042 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index efb787a879a30225cc5c8e475ba4eaf5675033d3..b3251759c8a77ea4777396bdd3fd0fd765cabc1b 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2006-06-25  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+        
+        Bug 9568: assertion failure in Safari after quitting Drosera
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=9568
+
+        Call switchToServerNamed:nil and not removeLister to make sure
+        the server object is set to nil to prevent further removeListener calls.
+
+        * Drosera/DebuggerDocument.m:
+        (-[DebuggerDocument applicationTerminating:]):
+
 2006-06-25  David Kilzer  <ddkilzer@kilzer.net>
 
         Reviewed by Darin.

diff --git a/WebKitTools/Drosera/DebuggerDocument.m b/WebKitTools/Drosera/DebuggerDocument.m
index 92d8f34be5f36886a9a99db060026eaff16ac6fa..512f82399194a00e84c19782d34aeabd060afe02 100644 (file)
--- a/WebKitTools/Drosera/DebuggerDocument.m
+++ b/WebKitTools/Drosera/DebuggerDocument.m
@@ -214,8 +214,7 @@ static NSString *DebuggerStepIntoToolbarItem = @"DebuggerStepIntoToolbarItem";
 - (void)applicationTerminating:(NSNotification *)notifiction
 {
     if (server && [[(NSDistantObject *)server connectionForProxy] isValid]) {
-        if ([[(NSDistantObject *)server connectionForProxy] isValid])
-            [server removeListener:self];
+        [self switchToServerNamed:nil];
         // call the runloop for a while to make sure our removeListener: is sent to the server
         [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.25]];
     }