diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-05-14 13:35:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-09-20 13:58:37 +0200 |
| commit | efc13dde88cf60604a9ec41bd145c48260fd4cc4 (patch) | |
| tree | decd856197830f094d97926077f6692e546d7986 /framework | |
| parent | Using the m_FeedbackFDs is now necessary also on iOS (diff) | |
| download | core-efc13dde88cf60604a9ec41bd145c48260fd4cc4.tar.gz core-efc13dde88cf60604a9ec41bd145c48260fd4cc4.zip | |
Don't call Application::Quit() in Desktop::terminate() on iOS
When exiting from a document in the iOS app, the Application::Quit()
would post an ImplQuitMsg user event that would however not be handled
for that document. Instead, it would be handled by the next document
opened and thus the code would immediately stop editing the document,
causing grief.
Change-Id: Id24c843b3f329673035da55f53c2134265fce003
(cherry picked from commit a1e87c7db378236e09b66584cd16200db7658c75)
Reviewed-on: https://gerrit.libreoffice.org/79212
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/desktop.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 111a3a8f0a7e..cc65a713a11c 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -243,7 +243,11 @@ sal_Bool SAL_CALL Desktop::terminate() if (bRestartableMainLoop) { +#ifndef IOS // or ANDROID? + // In the iOS app, posting the ImplQuitMsg user event will be too late, it will not be handled during the + // lifetime of the current document, but handled for the next document opened, which thus will break horribly. Application::Quit(); +#endif return true; } if ( ! bFramesClosed ) |