diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2021-07-09 15:14:50 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-13 15:46:52 +0200 |
| commit | 303c46e2394f6b744f0df5e8e55a8e1cd8e22a91 (patch) | |
| tree | 3e8537cfa9f0085ef3a0d3463265d9a6e414f539 /vcl | |
| parent | b862ec6ac16f3e02be7845bb0db7a77250cb587d (diff) | |
vcl: make get_id safe for disposed windows.
crash from:
findChild(vcl::Window*, rtl::OUString const&, bool) include/rtl/ustring.hxx:1744
WindowUIObject::get_visible_child(rtl::OUString const&) /vcl/source/uitest/uiobject.cxx:463
lcl_sendDialogEvent ...
Change-Id: Ic1756c7b03f2dee9780fb1a735917f1d0fc11876
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118691
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 41751c015a43..3a960cf76984 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3911,7 +3911,8 @@ void Window::set_id(const OUString& rID) const OUString& Window::get_id() const { - return mpWindowImpl->maID; + static OUString empty; + return mpWindowImpl ? mpWindowImpl->maID : empty; } FactoryFunction Window::GetUITestFactory() const |