summaryrefslogtreecommitdiffstats
path: root/vcl/unx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-03-07 11:28:32 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-07 12:19:23 +0000
commitc3c9a1c38d45fa12db6298a441c09f3e7dfe57c7 (patch)
treeca876924d2b2eb281cdb6f67cfa52d772dde3e85 /vcl/unx
parentcoverity#735992 Dereference after null check (diff)
downloadcore-c3c9a1c38d45fa12db6298a441c09f3e7dfe57c7.tar.gz
core-c3c9a1c38d45fa12db6298a441c09f3e7dfe57c7.zip
coverity#735999 Dereference after null check
Change-Id: Icd48e7051fa9eddedcf66c5589cdbd50ec98b843
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk/window/gtksalframe.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 6a0056074d96..9557f7a5a306 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3033,8 +3033,7 @@ void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11S
bool GtkSalFrame::SetPluginParent( SystemParentData* pSysParent )
{
#if !GTK_CHECK_VERSION(3,0,0)
- if( pSysParent ) // this may be the first system child frame now
- GetGenericData()->ErrorTrapPush(); // permanantly ignore unruly children's errors
+ GetGenericData()->ErrorTrapPush(); // permanantly ignore unruly children's errors
createNewWindow( pSysParent->aWindow, (pSysParent->nSize > sizeof(long)) ? pSysParent->bXEmbedSupport : false, m_nXScreen );
return true;
#else