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(bar): handle ipc connection errors.

Browse Source 
Try to use the default bar id (`bar-0`) if none is set.
This commit is contained in:
Aleksei Bavshin
2021-11-23 08:46:58 -08:00
parent 6bfb674d1b
commit 2290fe10aa
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/sway/bar.cpp
View File

@ -3,6 +3,8 @@
#include <fmt/ostream.h>
#include <spdlog/spdlog.h>
#include <stdexcept>
#include "bar.hpp"
#include "modules/sway/ipc/ipc.hpp"
@ -47,13 +49,13 @@ struct swaybar_config parseConfig(const Json::Value& payload) {
}
void BarIpcClient::onInitialConfig(const struct Ipc::ipc_response& res) {
try {
auto payload = parser_.parse(res.payload);
auto config = parseConfig(payload);
onConfigUpdate(config);
} catch (const std::exception& e) {
spdlog::error("BarIpcClient::onInitialConfig {}", e.what());
auto payload = parser_.parse(res.payload);
if (auto success = payload.get("success", true); !success.asBool()) {
auto err = payload.get("error", "Unknown error");
throw std::runtime_error(err.asString());
}
auto config = parseConfig(payload);
onConfigUpdate(config);
}
void BarIpcClient::onIpcEvent(const struct Ipc::ipc_response& res) {