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:40 +0000 |
| commit | ce7aeaa358dc0000dbcaf43c55670345fad8ee86 (patch) | |
| tree | addcac09f7f3e2e230edbd178bfc439049d1bd5d | |
| parent | fdo#68750: ensure that GetSuggestedEndOfSentence makes progress (diff) | |
| download | core-ce7aeaa358dc0000dbcaf43c55670345fad8ee86.tar.gz core-ce7aeaa358dc0000dbcaf43c55670345fad8ee86.zip | |
Resolves: rhbz#993963 NULL m_pWindow on firefox deleted plugin
Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67
(cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de)
Reviewed-on: https://gerrit.libreoffice.org/5773
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 0f53e935c780..fef84078fa9e 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -2698,7 +2698,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 ); |