[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/vcl sw/source

[Pranav Kant]

 include/vcl/ITiledRenderable.hxx  |    3 +++
 sw/source/uibase/uno/unotxdoc.cxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a7126570b15bfa17ae8fc37ca3a2f17c0c8f5028
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Mar 23 16:24:24 2018 +0530

    lok: don't post events on disposed window
    
    Change-Id: I7721380b1bb6e9ec21338a72523326d0cae6729e
    Reviewed-on: https://gerrit.libreoffice.org/51778
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 95775be55913..aa5e0c113e6f 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -101,6 +101,9 @@ public:
     static void LOKPostAsyncEvent(void* pEv, void*)
     {
         LOKAsyncEventData* pLOKEv = static_cast<LOKAsyncEventData*>(pEv);
+        if (pLOKEv->mpWindow->IsDisposed())
+            return;
+
         switch (pLOKEv->mnEvent)
         {
         case VCLEVENT_WINDOW_KEYINPUT:
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index e8dbe796ca5b..f578c5480bb4 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3492,7 +3492,7 @@ void SwXTextDocument::postKeyEvent(int nType, int nCharCode, int nKeyCode)
     SolarMutexGuard aGuard;
 
     VclPtr<vcl::Window> pWindow = getDocWindow();
-    if (!pWindow)
+    if (!pWindow || pWindow->IsDisposed())
         return;
 
     LOKAsyncEventData* pLOKEv = new LOKAsyncEventData;