diff options
| author | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 00:57:38 +0000 |
|---|---|---|
| committer | mdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-12 00:57:38 +0000 |
| commit | 0a0b0904b912eaad4d8fd921b78f6ede9f55a500 (patch) | |
| tree | 66f0d6325f416a9362ea5d5205fd08ae79289b29 /chrome/browser/ui/gtk | |
| parent | c57803b9edfd9b5ae79bdb91477879ca57646da1 (diff) | |
| download | chromium_src-0a0b0904b912eaad4d8fd921b78f6ede9f55a500.zip chromium_src-0a0b0904b912eaad4d8fd921b78f6ede9f55a500.tar.gz chromium_src-0a0b0904b912eaad4d8fd921b78f6ede9f55a500.tar.bz2 | |
Linux: add a NULL check in MenuGtk when rendering dynamic submenus.
(I suspect these may be related to running in Precise vs. Lucid.)
BUG=131974
Review URL: https://chromiumcodereview.appspot.com/10545120
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk')
| -rw-r--r-- | chrome/browser/ui/gtk/menu_gtk.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc index 4d9ad42..344fe6f 100644 --- a/chrome/browser/ui/gtk/menu_gtk.cc +++ b/chrome/browser/ui/gtk/menu_gtk.cc @@ -759,6 +759,9 @@ void MenuGtk::OnSubMenuShow(GtkWidget* submenu) { // Notify the submenu model that the menu will be shown. ui::MenuModel* submenu_model = static_cast<ui::MenuModel*>( g_object_get_data(G_OBJECT(menu_item), "submenu-model")); + // TODO(mdm): Figure out why this can sometimes be NULL. See bug 131974. + if (!submenu_model) + return; submenu_model->MenuWillShow(); // Actually build the submenu and attach it to the parent menu item. |