From a38f79e27936e2ee5af41be20b9aa7119cd9f2f1 Mon Sep 17 00:00:00 2001 From: Jarcode Date: Sun, 1 Sep 2019 21:46:50 -0700 Subject: [PATCH] Prefer system defaults for desktop window settings --- glava/glava.c | 2 ++ glava/render.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/glava/glava.c b/glava/glava.c index 94c2288..d34d4fd 100644 --- a/glava/glava.c +++ b/glava/glava.c @@ -127,6 +127,8 @@ static void copy_cfg(const char* path, const char* dest, bool verbose) { int source = -1, dest = -1; uint8_t buf[pgsz]; ssize_t r, t, w, a; + if (!strncmp(p, "env_", 4)) + break; if ((source = open(p, O_RDONLY)) < 0) { fprintf(stderr, "failed to open (source) '%s': %s\n", p, strerror(errno)); goto cleanup; diff --git a/glava/render.c b/glava/render.c index 8fff3f0..34502da 100644 --- a/glava/render.c +++ b/glava/render.c @@ -1281,7 +1281,7 @@ struct glava_renderer* rd_new(const char** paths, const char* entry, if (auto_desktop) { if (env) { - snprintf(se_buf, bsz, "%s/env_%s.glsl", data, env); + snprintf(se_buf, bsz, "%s/env_%s.glsl", dd, env); fd = open(se_buf, O_RDONLY); if (fd == -1) { if (errno != ENOENT &&