summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2018-06-28 23:42:44 +0200
committerPetr Mrázek <peterix@gmail.com>2018-06-28 23:42:44 +0200
commitbb599abf59a937e76b650825ba145687914a9ce8 (patch)
treee2b63569b1b151924dc18155a464a7257723fdf2
parent07f7ec8eefdcc27575a05319ef35662ac5b6993f (diff)
downloadMultiMC-bb599abf59a937e76b650825ba145687914a9ce8.tar
MultiMC-bb599abf59a937e76b650825ba145687914a9ce8.tar.gz
MultiMC-bb599abf59a937e76b650825ba145687914a9ce8.tar.lz
MultiMC-bb599abf59a937e76b650825ba145687914a9ce8.tar.xz
MultiMC-bb599abf59a937e76b650825ba145687914a9ce8.zip
NOISSUE fix a bug with mutexes on Windows, more warnings
-rw-r--r--api/logic/java/JavaUtils.cpp2
-rw-r--r--libraries/LocalPeer/src/LockedFile_win.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp
index 4a77bc7e..798c80e8 100644
--- a/api/logic/java/JavaUtils.cpp
+++ b/api/logic/java/JavaUtils.cpp
@@ -31,6 +31,7 @@ JavaUtils::JavaUtils()
{
}
+#ifdef Q_OS_LINUX
static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
{
QDir mmcBin(QCoreApplication::applicationDirPath());
@@ -48,6 +49,7 @@ static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
}
return final.join(':');
}
+#endif
QProcessEnvironment CleanEnviroment()
{
diff --git a/libraries/LocalPeer/src/LockedFile_win.cpp b/libraries/LocalPeer/src/LockedFile_win.cpp
index f93ef27f..31238190 100644
--- a/libraries/LocalPeer/src/LockedFile_win.cpp
+++ b/libraries/LocalPeer/src/LockedFile_win.cpp
@@ -66,7 +66,7 @@ Qt::HANDLE LockedFile::getMutexHandle(int idx, bool doCreate)
}
}
else {
- OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (LPCWSTR)mname.utf16());
+ mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (LPCWSTR)mname.utf16());
if (!mutex) {
if (GetLastError() != ERROR_FILE_NOT_FOUND)
qErrnoWarning("QtLockedFile::lock(): OpenMutex failed");