From 7fa1c118335cad40fdb92db49f4e35c8f8dc0bac Mon Sep 17 00:00:00 2001 From: Aleksei Bavshin Date: Wed, 20 Jan 2021 19:36:16 -0800 Subject: [PATCH] fix(client): unsubscribe after receiving xdg_output.done event Ignore any further xdg_output events. Name and description are constant for the lifetime of wl_output in xdg-output-unstable-v1 version 2 and we don't need other properties. Fixes #990. --- src/client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client.cpp b/src/client.cpp index 9fdf8703..0ad4e6bb 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -123,14 +123,14 @@ void waybar::Client::handleOutputDone(void *data, struct zxdg_output_v1 * /*xdg_ spdlog::debug("Output detection done: {} ({})", output.name, output.identifier); auto configs = client->getOutputConfigs(output); - if (configs.empty()) { - output.xdg_output.reset(); - } else { + if (!configs.empty()) { wl_display_roundtrip(client->wl_display); for (const auto &config : configs) { client->bars.emplace_back(std::make_unique(&output, config)); } } + // unsubscribe + output.xdg_output.reset(); } catch (const std::exception &e) { std::cerr << e.what() << std::endl; }