diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-03 12:24:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-03 12:44:44 +0000 |
| commit | 85049f0986dbfd277dd449b908d126065c92b7d3 (patch) | |
| tree | d9ebd14f4bb03ce055dadc55a66fc7bed30f3e7c | |
| parent | eed831380d3fdadc7defdbe66e7a8275507ca748 (diff) | |
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@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index fc5154b809db..05f7faa85800 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 ); |