aboutsummaryrefslogtreecommitdiff
path: root/sway/main.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/main.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/main.c')
-rw-r--r--sway/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/main.c b/sway/main.c
index f84451de..a7814364 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -7,7 +7,6 @@
#include "log.h"
#include "handlers.h"
-struct sway_config *config;
int main(int argc, char **argv) {
init_log(L_DEBUG); // TODO: Control this with command line arg
@@ -42,8 +41,8 @@ int main(int argc, char **argv) {
if (!wlc_init(&interface, argc, argv)) {
return 1;
}
-
setenv("DISPLAY", ":1", 1);
+
if (!load_config()) {
sway_abort("Unable to load config");
}