Seriously. DONT DEADLOCK

This commit is contained in:
jaynus 2015-05-16 12:38:57 -07:00
parent b871556d4f
commit 5e73d820e2

View File

@ -76,6 +76,7 @@ namespace ace {
bool controller::reset(const arguments &_args, std::string & result) {
_ready = false;
vehicles.clear();
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_messages(_messages_lock);
while (!_results.empty()) {
_results.pop();
@ -92,8 +92,9 @@ namespace ace {
while (!_messages.empty()) {
_messages.pop();
}
}
}
_ready = true;
return true;