summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 21:31:05 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-25 21:31:05 +0000
commitc637e529eafdffbc97a4760376975ea21a414cee (patch)
tree538122f3bd2398910870bf13ad90089a4ac05505
parent5b51bb2fd8f347ebf060a57b14ba51b91b5464cf (diff)
downloadchromium_src-c637e529eafdffbc97a4760376975ea21a414cee.zip
chromium_src-c637e529eafdffbc97a4760376975ea21a414cee.tar.gz
chromium_src-c637e529eafdffbc97a4760376975ea21a414cee.tar.bz2
Defensive patch that prevents a crash which doesn't have a solid repro but has been reported as still happening.
BUG=47758 TEST=none Review URL: http://codereview.chromium.org/3197020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57391 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/notifications/balloon_controller.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/notifications/balloon_controller.mm b/chrome/browser/cocoa/notifications/balloon_controller.mm
index 30849b3..1ab2805 100644
--- a/chrome/browser/cocoa/notifications/balloon_controller.mm
+++ b/chrome/browser/cocoa/notifications/balloon_controller.mm
@@ -138,7 +138,8 @@ const int kRightMargin = 2;
[self close];
if (htmlContents_.get())
htmlContents_->Shutdown();
- balloon_->OnClose(byUser);
+ if (balloon_)
+ balloon_->OnClose(byUser);
balloon_ = NULL;
}