diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 17:51:28 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 17:51:28 +0000 |
| commit | f02e062c30b9b37a6b44e20c8ce77db47fc6264b (patch) | |
| tree | 64bc6c8fc3d12c43e7a00d0f3da3a1382d422dc2 /chrome/browser/gtk/gtk_chrome_button.cc | |
| parent | d8e148382edd20b943e059374f847c394f368f53 (diff) | |
| download | chromium_src-f02e062c30b9b37a6b44e20c8ce77db47fc6264b.zip chromium_src-f02e062c30b9b37a6b44e20c8ce77db47fc6264b.tar.gz chromium_src-f02e062c30b9b37a6b44e20c8ce77db47fc6264b.tar.bz2 | |
Fix occasional crash at startup in gtk_chrome_button_expose.
Review URL: http://codereview.chromium.org/155697
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/gtk_chrome_button.cc')
| -rw-r--r-- | chrome/browser/gtk/gtk_chrome_button.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/gtk/gtk_chrome_button.cc b/chrome/browser/gtk/gtk_chrome_button.cc index 0a7942f..370ded1 100644 --- a/chrome/browser/gtk/gtk_chrome_button.cc +++ b/chrome/browser/gtk/gtk_chrome_button.cc @@ -99,8 +99,9 @@ static gboolean gtk_chrome_button_expose(GtkWidget* widget, if (paint_state == GTK_STATE_PRELIGHT || paint_state == GTK_STATE_ACTIVE) { (*GTK_WIDGET_CLASS(gtk_chrome_button_parent_class)->expose_event) (widget, event); - } else { - // Otherwise, we're still responsible for rendering our children. + } else if (gtk_bin_get_child(GTK_BIN(widget))) { + // Otherwise, we're still responsible for rendering our children if we + // have any. gtk_container_propagate_expose(GTK_CONTAINER(widget), gtk_bin_get_child(GTK_BIN(widget)), event); |