mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 09:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #546 from mikkeloscar/include-handle-dir

Browse source 
Don't try to read config if not a file.
This commit is contained in:
Drew DeVault 2016-03-26 12:58:19 -04:00
parent 3b849ce5a6 cdc73fd95e
commit 504a88434f
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sway/config.c
View file

@ -6,6 +6,7 @@
#include <wordexp.h> #include <wordexp.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/stat.h>
#include <signal.h> #include <signal.h>
#include <libinput.h> #include <libinput.h>
#include <limits.h> #include <limits.h>
@ -245,6 +246,11 @@ static char *get_config_path(void) {
static bool load_config(const char *path, struct sway_config *config) { static bool load_config(const char *path, struct sway_config *config) {
sway_log(L_INFO, "Loading config from %s", path); sway_log(L_INFO, "Loading config from %s", path);
struct stat sb;
if (stat(path, &sb) == 0 && S_ISDIR(sb.st_mode)) {
return false;
}
if (path == NULL) { if (path == NULL) {
sway_log(L_ERROR, "Unable to find a config file!"); sway_log(L_ERROR, "Unable to find a config file!");
return false; return false;