[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 37624d87110ca5f5990983ab73a2cd962d81d51a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 13 16:28:31 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu Jan 14 11:42:06 2021 +0100

    Resolves: tdf#139299 crash on gaining focus during dispose
    
    Change-Id: I5fd2b3cec7dd0c2c10c88006ef1812e57b547e0e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109128
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 53f1d45a72cd..bef75317d17a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -237,11 +237,14 @@ void OTableWindowListBox::GetFocus()
     if (m_pTabWin)
         m_pTabWin->setActive();
 
-    std::unique_ptr<weld::TreeIter> xCurrent = m_xTreeView->make_iterator();
-    if (m_xTreeView->get_cursor(xCurrent.get()))
+    if (m_xTreeView)
     {
-        m_xTreeView->unselect_all();
-        m_xTreeView->select(*xCurrent);
+        std::unique_ptr<weld::TreeIter> xCurrent = m_xTreeView->make_iterator();
+        if (m_xTreeView->get_cursor(xCurrent.get()))
+        {
+            m_xTreeView->unselect_all();
+            m_xTreeView->select(*xCurrent);
+        }
     }
 
     InterimItemWindow::GetFocus();