summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-06-27 13:54:51 +0300
committerTor Lillqvist <tml@collabora.com>2018-06-27 14:52:01 +0200
commit387f00311a1b2d12d16ae5731347cdc4328afa4a (patch)
treeb911146ed701491701c6422f07458c5e9ddbee32
parente5c8f2ba40223b67c7205b6f06da3aa344ed0e97 (diff)
tdf#53282: Leave (our own) full-screen mode when the AquaSalFrame is dying
Change-Id: I85243dff96b9090de0fd55564b44abb6142d9ac2 Reviewed-on: https://gerrit.libreoffice.org/56524 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/osx/salframe.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 31159f8545c0..d4debf4ef09a 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -92,6 +92,9 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, SalFrameStyleFlags salFrameStyle
AquaSalFrame::~AquaSalFrame()
{
+ if (mbFullScreen)
+ ShowFullScreen(false, maGeometry.nDisplayScreenNumber);
+
assert( GetSalData()->mpInstance->IsMainThread() );
// if the frame is destroyed and has the current menubar