blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash when monitor unplugged 

`Backlight#devices_` was being destructed before
`Backlight#udev_thread_`. Also check if thread is still running after
`epoll_wait`
This commit is contained in:
Ian Hattendorf 2019-02-25 20:05:44 -07:00
parent 4499a23e51
commit c1295c8fd6
No known key found for this signature in database
GPG Key ID: BE8B1B445E06437D
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/modules/backlight.hpp
View File

@ -56,11 +56,12 @@ private:
const std::string preferred_device_; const std::string preferred_device_;
static constexpr int EPOLL_MAX_EVENTS = 16; static constexpr int EPOLL_MAX_EVENTS = 16;
waybar::util::SleeperThread udev_thread_;
std::mutex udev_thread_mutex_;
std::vector<BacklightDev> devices_;
std::optional<BacklightDev> previous_best_; std::optional<BacklightDev> previous_best_;
std::string previous_format_; std::string previous_format_;
std::mutex udev_thread_mutex_;
std::vector<BacklightDev> devices_;
// thread must destruct before shared data
waybar::util::SleeperThread udev_thread_;
}; };
} // namespace waybar::modules } // namespace waybar::modules

3
src/modules/backlight.cpp
View File

@ -149,6 +149,9 @@ waybar::modules::Backlight::Backlight(const std::string &name,
const int event_count = const int event_count =
epoll_wait(epoll_fd.get(), events, EPOLL_MAX_EVENTS, epoll_wait(epoll_fd.get(), events, EPOLL_MAX_EVENTS,
std::chrono::milliseconds{interval_}.count()); std::chrono::milliseconds{interval_}.count());
if (!udev_thread_.isRunning()) {
break;
}
decltype(devices_) devices; decltype(devices_) devices;
{ {
std::scoped_lock<std::mutex> lock(udev_thread_mutex_); std::scoped_lock<std::mutex> lock(udev_thread_mutex_);