[Libreoffice-commits] core.git: sfx2/source

[Stephan Bergmann]

 sfx2/source/view/viewfrm2.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2a0d0e7e9940173f32092cd93c900449fe4d50eb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 12:54:18 2016 +0200

    ...and ignore DisposedException from multiple Frame::close
    
    ...follow-up to d2a59bb53ab6c6a364538bdc6928420d8cf72ba0 "Avoid deadlock when
    two threads call into Frame::close"
    
    Change-Id: I26fae3fffce683888805efcc450065c3737ec3c5

diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 4f6040e..cb0be79 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -261,6 +261,9 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
                         xTask->close(sal_True);
                         bClosed = true;
                     }
+                    catch (css::lang::DisposedException &) {
+                        // already closed; ignore
+                    }
                     catch( CloseVetoException& )
                     {
                         bClosed = false;