diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-08 21:01:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-08 21:05:34 +0000 |
| commit | 3cb4aa944afe335da373b3e0bafea5360cb8d665 (patch) | |
| tree | e72192b44434dcc84c34a895ae46fffa8a89fcee | |
| parent | 91b2be943e544a2e5c9e98f9ee7b816c40d1f076 (diff) | |
Resolves: rhbz#1050162 don't draw to NULL window
Change-Id: Ia84e3ae05f2d3eacfb48136ce920173b46783bc7
| -rw-r--r-- | vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 14f6d7adad87..4c00db56c76e 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -782,7 +782,6 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, const ImplControlValue& aValue, const OUString& rCaption ) { - sal_Bool returnVal = sal_False; // get a GC with current clipping region set GetFontGC(); @@ -839,6 +838,11 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, } } + assert(gdkDrawable); //rhbz#1050162 + if (gdkDrawable == 0) + return false; + + sal_Bool returnVal = sal_False; if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) ) { returnVal = NWPaintGTKButton( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption ); |