Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2025-01-13 08:01:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Gracefully exit when config is not found

Browse source 
This makes sure that sway will gracefully exit if the config is not
found or sway is unable to read it.
This commit is contained in:
Mikkel Oscar Lyderik 2016-03-24 22:13:42 +01:00
parent 06107bb44e
commit 938ff29b7b
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/config.c
View file

@ -256,7 +256,7 @@ bool load_config(const char *file) {
FILE *f = fopen(path, "r");
if (!f) {
fprintf(stderr, "Unable to open %s for reading", path);
sway_log(L_ERROR, "Unable to open %s for reading", path);
free(path);
return false;
}
@ -272,7 +272,11 @@ bool load_config(const char *file) {
update_active_bar_modifiers();
return config_load_success;
if (!config_load_success) {
sway_log(L_ERROR, "Error(s) loading config!");
}
return true;
}
bool read_config(FILE *file, bool is_active) {

3
sway/main.c
View file

@ -211,8 +211,9 @@ int main(int argc, char **argv) {
}
if (!load_config(config_path)) {
sway_log(L_ERROR, "Error(s) loading config!");
sway_terminate(EXIT_FAILURE);
}
if (config_path) {
free(config_path);
}