diff options
| -rw-r--r-- | .gitreview | 2 | ||||
| -rw-r--r-- | wsd/LOOLWSD.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitreview b/.gitreview index 489239f60..402f38775 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=logerrit port=29418 project=online defaultremote=logerrit -defaultbranch=distro/collabora/collabora-online-4 +defaultbranch=distro/collabora/collabora-online-4-0 diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 97b774cd0..44d43ae35 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -3392,6 +3392,10 @@ void LOOLWSD::cleanup() } #endif #endif + + // Delete these while the static Admin instance is still alive. + std::lock_guard<std::mutex> docBrokersLock(DocBrokersMutex); + DocBrokers.clear(); } int LOOLWSD::main(const std::vector<std::string>& /*args*/) |