diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-11-11 16:51:05 -0500 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-26 11:46:14 +0200 |
| commit | a1b718044dadc46388bff0e20a7e50bf9d514596 (patch) | |
| tree | b3fb931817786bd6ce5c472fb600f411192e4441 /vcl | |
| parent | e054cfb3538fec4992ab28627a26aa23b6c4fbb7 (diff) | |
LOK: sidebar: release LOKNotifier on destruction
And enable sidebar routing only while we have a
valid SidebarController instance (i.e. not disposed).
Change-Id: I665f934f762c0ce9efdce5489ec9babe006376a8
Reviewed-on: https://gerrit.libreoffice.org/73512
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 3b26f70d7040..2ac475725996 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3173,6 +3173,8 @@ void Window::SetLOKNotifier(const vcl::ILibreOfficeKitNotifier* pNotifier, bool // don't allow setting this twice assert(mpWindowImpl->mpLOKNotifier == nullptr); assert(pNotifier); + // never use this in the desktop case + assert(comphelper::LibreOfficeKit::isActive()); if (!bParent) { |