summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 00:39:20 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-19 00:39:20 +0000
commit720d1a8fb001712d0486b09ea36c461de9eda925 (patch)
tree9552c3f7b8ffce53a6c73be0d5ac2f256553ed8f
parent82b0c0b057bfded52bc5e72f40594ded430613a0 (diff)
downloadchromium_src-720d1a8fb001712d0486b09ea36c461de9eda925.zip
chromium_src-720d1a8fb001712d0486b09ea36c461de9eda925.tar.gz
chromium_src-720d1a8fb001712d0486b09ea36c461de9eda925.tar.bz2
Fix a crash when double clicking a menu button.
Review URL: http://codereview.chromium.org/42376 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12063 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/views/controls/button/button.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/views/controls/button/button.cc b/chrome/views/controls/button/button.cc
index 5c28138..29b5da8 100644
--- a/chrome/views/controls/button/button.cc
+++ b/chrome/views/controls/button/button.cc
@@ -63,7 +63,10 @@ Button::Button(ButtonListener* listener)
void Button::NotifyClick(int mouse_event_flags) {
mouse_event_flags_ = mouse_event_flags;
- listener_->ButtonPressed(this);
+ // We can be called when there is no listener, in cases like double clicks on
+ // menu buttons etc.
+ if (listener_)
+ listener_->ButtonPressed(this);
// NOTE: don't attempt to reset mouse_event_flags_ as the listener may have
// deleted us.
}