[Libreoffice-commits] core.git: vcl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Wed Apr 28 14:14:53 UTC 2021


 vcl/source/uitest/uiobject.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d6605cc5f4e2b2cc52e2f2c9645a09171529d9d0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 28 11:11:57 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 28 16:14:13 2021 +0200

    disposed window accessed during UITest_sw_navigator
    
    Change-Id: I476c7cda4a9997b4c0a04a0838d608bf78b495d1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114778
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 6861cd1bdfc3..36af49a38afe 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -490,10 +490,13 @@ std::unique_ptr<UIObject> WindowUIObject::get_visible_child(const OUString& rID)
 
 std::set<OUString> WindowUIObject::get_children() const
 {
-    vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
     std::set<OUString> aChildren;
-    aChildren.insert(pDialogParent->get_id());
-    addChildren(pDialogParent, aChildren);
+    vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
+    if (!pDialogParent->isDisposed())
+    {
+        aChildren.insert(pDialogParent->get_id());
+        addChildren(pDialogParent, aChildren);
+    }
     return aChildren;
 }
 


More information about the Libreoffice-commits mailing list