diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 20:39:33 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 20:39:33 +0000 |
| commit | 6e9f27f9b6839b7a07e44a6299bfa48579fe5ba2 (patch) | |
| tree | 59e797fb0d280b51e2a9cea2be1906ac09d37e2d /chrome/browser/gtk | |
| parent | 100a291254a7d72236539a6deda1a173331973c1 (diff) | |
| download | chromium_src-6e9f27f9b6839b7a07e44a6299bfa48579fe5ba2.zip chromium_src-6e9f27f9b6839b7a07e44a6299bfa48579fe5ba2.tar.gz chromium_src-6e9f27f9b6839b7a07e44a6299bfa48579fe5ba2.tar.bz2 | |
Fix same crashy assumption that I fixed in r20967 later on in normal theme mode.
Review URL: http://codereview.chromium.org/155709
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20991 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
| -rw-r--r-- | chrome/browser/gtk/gtk_chrome_button.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/gtk/gtk_chrome_button.cc b/chrome/browser/gtk/gtk_chrome_button.cc index 370ded1..0fc3480 100644 --- a/chrome/browser/gtk/gtk_chrome_button.cc +++ b/chrome/browser/gtk/gtk_chrome_button.cc @@ -117,9 +117,12 @@ static gboolean gtk_chrome_button_expose(GtkWidget* widget, if (nine_box) nine_box->RenderToWidget(widget); - gtk_container_propagate_expose(GTK_CONTAINER(widget), - gtk_bin_get_child(GTK_BIN(widget)), - event); + // If we have a child widget, draw it. + if (gtk_bin_get_child(GTK_BIN(widget))) { + gtk_container_propagate_expose(GTK_CONTAINER(widget), + gtk_bin_get_child(GTK_BIN(widget)), + event); + } } return TRUE; // Don't propagate, we are the default handler. |