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

Don't try to read config if not a file.
master
Drew DeVault 9 years ago
commit 504a88434f

@ -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;

Loading…
Cancel
Save