mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-26 00:15:16 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE fix a bug with mutexes on Windows, more warnings

Browse Source
This commit is contained in:
Petr Mrázek 2018-06-28 23:42:44 +02:00
parent 07f7ec8eef
commit bb599abf59
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/java/JavaUtils.cpp
View File

@ -31,6 +31,7 @@ JavaUtils::JavaUtils()
{ {
} }
#ifdef Q_OS_LINUX
static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH) static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
{ {
QDir mmcBin(QCoreApplication::applicationDirPath()); QDir mmcBin(QCoreApplication::applicationDirPath());
@ -48,6 +49,7 @@ static QString processLD_LIBRARY_PATH(const QString & LD_LIBRARY_PATH)
} }
return final.join(':'); return final.join(':');
} }
#endif
QProcessEnvironment CleanEnviroment() QProcessEnvironment CleanEnviroment()
{ {

2
libraries/LocalPeer/src/LockedFile_win.cpp
View File

@ -66,7 +66,7 @@ Qt::HANDLE LockedFile::getMutexHandle(int idx, bool doCreate)
} }
} }
else { else {
OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (LPCWSTR)mname.utf16()); mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (LPCWSTR)mname.utf16());
if (!mutex) { if (!mutex) {
if (GetLastError() != ERROR_FILE_NOT_FOUND) if (GetLastError() != ERROR_FILE_NOT_FOUND)
qErrnoWarning("QtLockedFile::lock(): OpenMutex failed"); qErrnoWarning("QtLockedFile::lock(): OpenMutex failed");