diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-06 12:54:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-06 12:54:18 +0200 |
| commit | 2a0d0e7e9940173f32092cd93c900449fe4d50eb (patch) | |
| tree | 8e9412b784ed0a8ad7f062ec250eeb0bb23c31c3 | |
| parent | d2a59bb53ab6c6a364538bdc6928420d8cf72ba0 (diff) | |
...and ignore DisposedException from multiple Frame::close
...follow-up to d2a59bb53ab6c6a364538bdc6928420d8cf72ba0 "Avoid deadlock when
two threads call into Frame::close"
Change-Id: I26fae3fffce683888805efcc450065c3737ec3c5
| -rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
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; |