diff options
| author | Luminarys <[email protected]> | 2015-08-10 19:50:22 -0500 |
|---|---|---|
| committer | Luminarys <[email protected]> | 2015-08-11 12:48:55 -0500 |
| commit | a5b02791d43cc68cc9686266f725be0fea7072fa (patch) | |
| tree | daa3849d3a225b31c9ad246fff0dbdeed25ee2ca /sway/main.c | |
| parent | 803a4739b61ef71204d58bb5464b9a2ebd57cf36 (diff) | |
Changed command handler to perform var subs on all cmd args
Fixed workspace_next_name to use the first workspace name it can find in the config
Minor fixes
Changed command handler to perform var subs on all portions of a command
Revert "Changed command handler to perform var subs on all portions of a command"
This reverts commit fcfcffa1ea9819bcada6e6c85b40b21bf1b3a96e.
Var sub fixes
Minor fixes
More minor fixes
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 3 |
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"); } |