[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - framework/source

[Tor Lillqvist (via logerrit)]

 framework/source/services/desktop.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit a1e87c7db378236e09b66584cd16200db7658c75
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue May 14 13:35:11 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue May 14 14:58:47 2019 +0300

    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

diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index b479687fdeae..6eede20c1fed 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -242,7 +242,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 )