From 2a0d0e7e9940173f32092cd93c900449fe4d50eb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 6 Apr 2016 12:54:18 +0200 Subject: [PATCH] ...and ignore DisposedException from multiple Frame::close ...follow-up to d2a59bb53ab6c6a364538bdc6928420d8cf72ba0 "Avoid deadlock when two threads call into Frame::close" Change-Id: I26fae3fffce683888805efcc450065c3737ec3c5 --- sfx2/source/view/viewfrm2.cxx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 4f6040eee9d5..cb0be79264f7 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;