aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Violet Purcell <vimproved@inventati.org>2024-02-03 12:12:37 -0500
committerLibravatar Simon Ser <contact@emersion.fr>2024-02-09 18:23:03 +0100
commit1c07868f2fddf2e959e615a8302b3a61b3625003 (patch)
tree55821b63835b7abba5ca480ecc383e78651ebc48
parentbuild: bump version to 1.9-rc.2 (diff)
downloadsway-1c07868f2fddf2e959e615a8302b3a61b3625003.tar.gz
sway-1c07868f2fddf2e959e615a8302b3a61b3625003.tar.zst
sway-1c07868f2fddf2e959e615a8302b3a61b3625003.zip
sway/config.c: only reset primary_selection at launch
Otherwise, an error will be shown whenever reloading due to the value of primary_selection being reset to true. (cherry picked from commit 6b2aa8324681b2623f660c3851397761df9b70dc)
-rw-r--r--sway/config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 4b51dc73..099e0e81 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -475,6 +475,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
475 old_config->xwayland ? "enabled" : "disabled"); 475 old_config->xwayland ? "enabled" : "disabled");
476 config->xwayland = old_config->xwayland; 476 config->xwayland = old_config->xwayland;
477 477
478 // primary_selection can only be enabled/disabled at launch
479 sway_log(SWAY_DEBUG, "primary_selection will remain %s",
480 old_config->primary_selection ? "enabled" : "disabled");
481 config->primary_selection = old_config->primary_selection;
482
478 if (!config->validating) { 483 if (!config->validating) {
479 if (old_config->swaybg_client != NULL) { 484 if (old_config->swaybg_client != NULL) {
480 wl_client_destroy(old_config->swaybg_client); 485 wl_client_destroy(old_config->swaybg_client);