Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Seriously. DONT DEADLOCK

Browse Source
This commit is contained in:
jaynus 2015-05-16 12:38:57 -07:00
parent b871556d4f
commit 5e73d820e2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/vd/controller.cpp
View File

@ -76,6 +76,7 @@ namespace ace {
bool controller::reset(const arguments &_args, std::string & result) { bool controller::reset(const arguments &_args, std::string & result) {
_ready = false; _ready = false;
vehicles.clear(); vehicles.clear();
if (!ace::model_collection::get().ready()) { if (!ace::model_collection::get().ready()) {
@ -84,7 +85,6 @@ namespace ace {
{ {
std::lock_guard<std::mutex> lock_results(_results_lock); std::lock_guard<std::mutex> lock_results(_results_lock);
//std::lock_guard<std::mutex> lock_messages(_messages_lock);
while (!_results.empty()) { while (!_results.empty()) {
_results.pop(); _results.pop();
@ -94,6 +94,7 @@ namespace ace {
_messages.pop(); _messages.pop();
} }
} }
_ready = true; _ready = true;
return true; return true;