add some more helpful paranoia to disposeOnce.

Change-Id: I46f2bf5115f2b80990fdcac75bd31615c4221b9e

1 files changed, 7 insertions, 0 deletions

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6ee6dc001d3f..d2177e44ce34 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -142,6 +142,13 @@ void Window::disposeOnce()
     if (!mpWindowImpl || mpWindowImpl->mbInDispose)
         return;
     mpWindowImpl->mbInDispose = true;
+
+    // catch badness where our Window was not wrapped safely
+    // in a VclPtr cosily.
+    assert( mnRefCnt>0 );
+
+    // hold a ref in case something silly happens during dispose.
+    VclPtr<Window> aRef(this);
     dispose();
 }