[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Michael Meeks]

 vcl/source/window/window.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2ffc7299718376fa684decb0af20e24758fd734d
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Jul 3 15:50:38 2015 +0100

    tdf#92392 - tolerate Window::SetText post dispose.
    
    Change-Id: I458f8e8665373d3e5ab9ed20e39783f4d34ca128
    Reviewed-on: https://gerrit.libreoffice.org/16752
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 372ea7d..8afd412 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3184,7 +3184,7 @@ void Window::SetCursor( vcl::Cursor* pCursor )
 
 void Window::SetText( const OUString& rStr )
 {
-    if (rStr == mpWindowImpl->maText)
+    if (!mpWindowImpl || rStr == mpWindowImpl->maText)
         return;
 
     OUString oldTitle( mpWindowImpl->maText );