Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Temporary fix

Browse Source
This commit is contained in:
momo5502 2016-09-06 21:31:12 +02:00
parent 8fb6ea0b63
commit 9298e5688f
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/bitmrc vendored

@ -1 +1 @@
Subproject commit 52aa771b9274056eb1e30b5c7fbfd1669c053265 Subproject commit 43f63eeb1f900fd03b192e7e577c033a6be072ab

2
deps/protobuf vendored

@ -1 +1 @@
Subproject commit 9b8da104c12a2947b6e6d7a7da30a3ae56b31675 Subproject commit 74638a253ea76baa0aed78491b92d157326295a6

4
src/Components/Modules/Bans.cpp
View File

@ -39,7 +39,7 @@ namespace Components
Bans::BanList list; Bans::BanList list;
Bans::LoadBans(&list); Bans::LoadBans(&list);
Bans::AccessMutex.lock(); std::lock_guard<std::mutex> _(Bans::AccessMutex);
if (entry.first.Bits) if (entry.first.Bits)
{ {
@ -102,8 +102,6 @@ namespace Components
FileSystem::FileWriter ban("bans.json"); FileSystem::FileWriter ban("bans.json");
ban.Write(bans.dump()); ban.Write(bans.dump());
Bans::AccessMutex.unlock();
} }
void Bans::LoadBans(Bans::BanList* list) void Bans::LoadBans(Bans::BanList* list)

4
src/Components/Modules/Toast.cpp
View File

@ -103,7 +103,7 @@ namespace Components
{ {
if (Toast::Queue.empty()) return; if (Toast::Queue.empty()) return;
Toast::Mutex.lock(); std::lock_guard<std::mutex> _(Toast::Mutex);
Toast::UIToast* toast = &Toast::Queue.front(); Toast::UIToast* toast = &Toast::Queue.front();
@ -121,8 +121,6 @@ namespace Components
{ {
Toast::Draw(toast); Toast::Draw(toast);
} }
Toast::Mutex.unlock();
} }
Toast::Toast() Toast::Toast()