[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/window/gtkframe.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 85049f0986dbfd277dd449b908d126065c92b7d3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 3 12:24:34 2013 +0100

    Resolves: rhbz#993963 NULL m_pWindow on firefox deleted plugin
    
    (cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de)
    
    Conflicts:
    	vcl/unx/gtk/window/gtksalframe.cxx
    
    Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67
    Reviewed-on: https://gerrit.libreoffice.org/5774
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index fc5154b..05f7faa 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2719,7 +2719,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
 
 void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, SalX11Screen nXScreen )
 {
-    bool bWasVisible = IS_WIDGET_MAPPED(m_pWindow);
+    bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
     if( bWasVisible )
         Show( sal_False );