diff options
author | Simon Ser <contact@emersion.fr> | 2024-02-05 11:07:33 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2024-02-05 11:07:33 +0100 |
commit | f7a0f06dffb655a3335981c0ca010f25ac18c39d (patch) | |
tree | 3c0637536631e4efa44bfcaf012e584f7573a788 | |
parent | commands/primary_selection: drop duplicate bool parsing (diff) | |
download | sway-f7a0f06dffb655a3335981c0ca010f25ac18c39d.tar.gz sway-f7a0f06dffb655a3335981c0ca010f25ac18c39d.tar.zst sway-f7a0f06dffb655a3335981c0ca010f25ac18c39d.zip |
commands: note how xwayland/primary_selection are reset on reload
-rw-r--r-- | sway/commands/primary_selection.c | 2 | ||||
-rw-r--r-- | sway/commands/xwayland.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands/primary_selection.c b/sway/commands/primary_selection.c index 3edef945..9e2689c2 100644 --- a/sway/commands/primary_selection.c +++ b/sway/commands/primary_selection.c | |||
@@ -12,6 +12,8 @@ struct cmd_results *cmd_primary_selection(int argc, char **argv) { | |||
12 | 12 | ||
13 | bool primary_selection = parse_boolean(argv[0], true); | 13 | bool primary_selection = parse_boolean(argv[0], true); |
14 | 14 | ||
15 | // config->primary_selection is reset to the previous value on reload in | ||
16 | // load_main_config() | ||
15 | if (config->reloading && config->primary_selection != primary_selection) { | 17 | if (config->reloading && config->primary_selection != primary_selection) { |
16 | return cmd_results_new(CMD_FAILURE, | 18 | return cmd_results_new(CMD_FAILURE, |
17 | "primary_selection can only be enabled/disabled at launch"); | 19 | "primary_selection can only be enabled/disabled at launch"); |
diff --git a/sway/commands/xwayland.c b/sway/commands/xwayland.c index 6ca26923..584a8e3a 100644 --- a/sway/commands/xwayland.c +++ b/sway/commands/xwayland.c | |||
@@ -20,6 +20,8 @@ struct cmd_results *cmd_xwayland(int argc, char **argv) { | |||
20 | xwayland = XWAYLAND_MODE_DISABLED; | 20 | xwayland = XWAYLAND_MODE_DISABLED; |
21 | } | 21 | } |
22 | 22 | ||
23 | // config->xwayland is reset to the previous value on reload in | ||
24 | // load_main_config() | ||
23 | if (config->reloading && config->xwayland != xwayland) { | 25 | if (config->reloading && config->xwayland != xwayland) { |
24 | return cmd_results_new(CMD_FAILURE, | 26 | return cmd_results_new(CMD_FAILURE, |
25 | "xwayland can only be enabled/disabled at launch"); | 27 | "xwayland can only be enabled/disabled at launch"); |