From 85e092f7a78caed7e7cccd14241709fc6303f56c Mon Sep 17 00:00:00 2001 From: thatcher Date: Mon, 26 Jun 2006 02:17:48 +0000 Subject: [PATCH] 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 --- WebKitTools/ChangeLog | 13 +++++++++++++ WebKitTools/Drosera/DebuggerDocument.m | 3 +-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index efb787a879a3..b3251759c8a7 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,16 @@ +2006-06-25 Timothy Hatcher + + 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 Reviewed by Darin. diff --git a/WebKitTools/Drosera/DebuggerDocument.m b/WebKitTools/Drosera/DebuggerDocument.m index 92d8f34be5f3..512f82399194 100644 --- 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]]; } -- 2.36.0