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-05 11:04:36 +0100
commit6b2aa8324681b2623f660c3851397761df9b70dc (patch)
tree17f54c469290c97cc82f71869e139ae0eaf159bb
parentDrop old security config remnants (diff)
downloadsway-6b2aa8324681b2623f660c3851397761df9b70dc.tar.gz
sway-6b2aa8324681b2623f660c3851397761df9b70dc.tar.zst
sway-6b2aa8324681b2623f660c3851397761df9b70dc.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.
-rw-r--r--sway/config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 64ad9c70..d7b6b693 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);