[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - sw/source

[Libreoffice Gerrit user]

 sw/source/uibase/uiview/pview.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0184d4733415c89f2c17a583569e249b2e829939
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Aug 1 21:20:10 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Aug 2 16:24:07 2018 +0200

    tdf#119042: Also check if SfxViewFrame::Current() is nullptr
    
    Change-Id: I5ac43ff626bfb4e2e754cacead5bf87115f3ce4b
    Reviewed-on: https://gerrit.libreoffice.org/58447
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Jenkins
    (cherry picked from commit d0a481d09e696f6d5a2a0d40a9d5c48cfca559bf)
    Reviewed-on: https://gerrit.libreoffice.org/58458
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 7b71101baa8a..d0c2cbbbf0a3 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1248,8 +1248,9 @@ SwPagePreview::~SwPagePreview()
     delete pVShell;
 
     m_pViewWin.disposeAndClear();
-    if (auto& pBar = SfxViewFrame::Current()->GetWindow().GetSystemWindow()->GetNotebookBar())
-        pBar->ControlListener(false);
+    if (SfxViewFrame* pCurrent = SfxViewFrame::Current())
+        if (auto& pBar = pCurrent->GetWindow().GetSystemWindow()->GetNotebookBar())
+            pBar->ControlListener(false);
     m_pScrollFill.disposeAndClear();
     m_pHScrollbar.disposeAndClear();
     m_pVScrollbar.disposeAndClear();