tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(workspaces): check thread is running

Browse Source
This commit is contained in:
Alexis
2018-12-09 10:49:28 +01:00
parent 0acc50264e
commit c7b0639f32
5 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/sway/ipc/client.cpp
View File

@ -69,8 +69,7 @@ struct waybar::modules::sway::Ipc::ipc_response
size_t total = 0;
while (total < ipc_header_size_) {
ssize_t res =
::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
auto res = ::recv(fd, header.data() + total, ipc_header_size_ - total, 0);
if (res <= 0) {
throw std::runtime_error("Unable to receive IPC response");
}
@ -81,8 +80,7 @@ struct waybar::modules::sway::Ipc::ipc_response
std::string payload;
payload.reserve(data32[0] + 1);
while (total < data32[0]) {
ssize_t res =
::recv(fd, payload.data() + total, data32[0] - total, 0);
auto res = ::recv(fd, payload.data() + total, data32[0] - total, 0);
if (res < 0) {
throw std::runtime_error("Unable to receive IPC response");
}

2
src/modules/sway/mode.cpp
View File

@ -24,7 +24,7 @@ void waybar::modules::sway::Mode::worker()
dp.emit();
}
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
std::cerr << "Mode: " << e.what() << std::endl;
}
};
}

2
src/modules/sway/window.cpp
View File

@ -36,7 +36,7 @@ void waybar::modules::sway::Window::worker()
dp.emit();
}
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
std::cerr << "Window: " << e.what() << std::endl;
}
};
}

4
src/modules/sway/workspaces.cpp
View File

@ -20,7 +20,7 @@ void waybar::modules::sway::Workspaces::worker()
while (bar_.output_name.empty()) {
thread_.sleep_for(chrono::milliseconds(150));
}
} else if (!workspaces_.empty()) {
} else if (thread_.isRunnging() && !workspaces_.empty()) {
ipc_.handleEvent();
}
{
@ -30,7 +30,7 @@ void waybar::modules::sway::Workspaces::worker()
}
dp.emit();
} catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
std::cerr << "Workspaces: " << e.what() << std::endl;
}
};
}