pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(controller): Handle connection error

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-03 15:12:11 +01:00
parent 91ee4c825b
commit 158d4dd515
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/controller.cpp
View File

@ -276,17 +276,22 @@ void controller::wait_for_xevent() {
shared_ptr<xcb_generic_event_t> evt; shared_ptr<xcb_generic_event_t> evt;
while (m_running) { while (m_running) {
try { try {
int error = 0; if ((evt = m_connection.wait_for_event()) != nullptr && m_running) {
if ((error = m_connection.connection_has_error()) != 0) {
m_log.err("Error in X event loop, terminating... (%s)", m_connection.error_str(error));
kill(getpid(), SIGTERM);
} else if ((evt = m_connection.wait_for_event()) != nullptr && m_running) {
m_connection.dispatch_event(evt); m_connection.dispatch_event(evt);
} }
} catch (xpp::connection_error& err) {
m_log.err("X connection error, terminating... (what: %s)", m_connection.error_str(err.code()));
} catch (const exception& err) { } catch (const exception& err) {
m_log.err("Error in X event loop: %s", err.what()); m_log.err("Error in X event loop: %s", err.what());
} }
if (m_connection.connection_has_error()) {
break;
}
}
if (m_running) {
kill(getpid(), SIGTERM);
} }
} }