summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
Diffstat (limited to 'sway')
-rw-r--r--sway/config.c5
-rw-r--r--sway/swaynag.c9
2 files changed, 3 insertions, 11 deletions
diff --git a/sway/config.c b/sway/config.c
index 4464b006..c1ec77f9 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -386,8 +386,9 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
386 config->active = true; 386 config->active = true;
387 387
388 swaynag_kill(&old_config->swaynag_config_errors); 388 swaynag_kill(&old_config->swaynag_config_errors);
389 swaynag_clone(&config->swaynag_config_errors, 389 memcpy(&config->swaynag_config_errors,
390 &old_config->swaynag_config_errors); 390 &old_config->swaynag_config_errors,
391 sizeof(struct swaynag_instance));
391 392
392 create_default_output_configs(); 393 create_default_output_configs();
393 } 394 }
diff --git a/sway/swaynag.c b/sway/swaynag.c
index 2dc0cb21..f5370807 100644
--- a/sway/swaynag.c
+++ b/sway/swaynag.c
@@ -8,15 +8,6 @@
8#include "log.h" 8#include "log.h"
9#include "sway/swaynag.h" 9#include "sway/swaynag.h"
10 10
11void swaynag_clone(struct swaynag_instance *dest,
12 struct swaynag_instance *src) {
13 dest->args = src->args;
14 dest->pid = src->pid;
15 dest->fd[0] = src->fd[0];
16 dest->fd[1] = src->fd[1];
17 dest->detailed = src->detailed;
18}
19
20bool swaynag_spawn(const char *swaynag_command, 11bool swaynag_spawn(const char *swaynag_command,
21 struct swaynag_instance *swaynag) { 12 struct swaynag_instance *swaynag) {
22 if (swaynag->detailed) { 13 if (swaynag->detailed) {