aboutsummaryrefslogtreecommitdiff
path: root/sway/config.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2015-08-11 13:55:36 -0400
committerDrew DeVault <sir@cmpwn.com>2015-08-11 13:55:36 -0400
commitab33fd5ecdc07a594ca1cc2a6da1780d1f22665d (patch)
treedaa3849d3a225b31c9ad246fff0dbdeed25ee2ca /sway/config.c
parent803a4739b61ef71204d58bb5464b9a2ebd57cf36 (diff)
parenta5b02791d43cc68cc9686266f725be0fea7072fa (diff)
Merge pull request #19 from Luminarys/master
Changed command handler to perform var subs on all cmd args
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c
index a1689f36..6fe681f6 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -8,6 +8,8 @@
#include "commands.h"
#include "config.h"
+struct sway_config *config;
+
bool load_config() {
sway_log(L_INFO, "Loading config");
// TODO: Allow use of more config file locations
@@ -82,7 +84,7 @@ _continue:
}
if (is_active) {
- config->reloading = true;
+ config->reloading = false;
}
return config;