commit 0a04150b6eefb5feb7ecefaa5cd63dbac8c1574f
author Stephan Bergmann <sbergman@redhat.com> Tue Apr 23 15:10:53 2019 +0200
committer Stephan Bergmann <sbergman@redhat.com> Tue Apr 23 20:08:56 2019 +0200
tree bba1090934db2442396252fd997ecaf08e1dd72e
parent aafc733e8d8447f1ba878faa6e7ed3804ed44007

tdf#124635 MountOperation::Mount can be called with SolarMutex unlocked

Change-Id: I7a36dd235a100b0d283eec86646dc167ac224ba7
Reviewed-on: https://gerrit.libreoffice.org/71133
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

ucb/source/ucp/gio/gio_content.cxx

diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index b1b5155..d3a910c 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -349,8 +349,15 @@
        // GdkThreadsLeave unlock the SolarMutex down to zero at the end of
        // g_main_loop_run, so we need ~SolarMutexReleaser to raise it back to
        // the original value again:
        SolarMutexReleaser rel;
        g_main_loop_run(mpLoop);
        if (comphelper::SolarMutex::get()->IsCurrentThread())
        {
            SolarMutexReleaser rel;
            g_main_loop_run(mpLoop);
        }
        else
        {
            g_main_loop_run(mpLoop);
        }
    }
    return mpError;
}