summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-08-17 16:52:09 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-08-17 16:52:09 +0100
commit04b8da43d42a6a37bbf0f1edb748990591f04dbc (patch)
treed526ac9ea451121c898eb78dad6d1849598c9600
parentAdd missing headers & fix whitespace. (diff)
downloadonline-04b8da43d42a6a37bbf0f1edb748990591f04dbc.tar.gz
online-04b8da43d42a6a37bbf0f1edb748990591f04dbc.zip
Remove un-necessary lock.
-rw-r--r--loolwsd/LOOLKit.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 9394e43b24..e47ca4d333 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -89,8 +89,6 @@ static int prefixcmp(const char *str, const char *prefix)
const int MASTER_PORT_NUMBER = 9981;
const std::string CHILD_URI = "/loolws/child/";
-Poco::NamedMutex _namedMutexLOOL("loolwsd");
-
int main(int argc, char** argv)
{
std::string loSubPath;
@@ -130,8 +128,6 @@ int main(int argc, char** argv)
try
{
- _namedMutexLOOL.lock();
-
#ifdef __APPLE__
LibreOfficeKit *loKit(lok_init_2(("/" + loSubPath + "/Frameworks").c_str(), "file:///user"));
#else
@@ -144,8 +140,6 @@ int main(int argc, char** argv)
exit(-1);
}
- _namedMutexLOOL.unlock();
-
// Open websocket connection between the child process and the
// parent. The parent forwards us requests that it can't handle.