Rooba
/
polybar
mirror of https://github.com/polybar/polybar.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Revert nested locking in module destruct

This commit is contained in:
Michael Carlberg 2016-06-21 16:34:19 +02:00
parent 2b39fcd7dd
commit 1e5fc993a4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/modules/base.hpp
View File

@ -129,20 +129,16 @@ namespace modules
if (this->enabled()) if (this->enabled())
this->stop(); this->stop();
std::lock_guard<concurrency::SpinLock> lck(this->broadcast_lock); std::lock_guard<concurrency::SpinLock> lck(this->update_lock);
{ {
std::lock_guard<concurrency::SpinLock> lck(this->update_lock); for (auto &&t : this->threads) {
{ if (t.joinable())
std::lock_guard<concurrency::SpinLock> lck(this->output_lock); t.join();
{ else
for (auto &&t : this->threads) { log_warning("["+ ConstCastModule(ModuleImpl).name() +"] Runner thread not joinable");
if (t.joinable())
t.join();
else
log_warning("["+ ConstCastModule(ModuleImpl).name() +"] Runner thread not joinable");
}
}
} }
this->threads.clear();
} }
log_trace(name()); log_trace(name());