summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2016-08-20 12:30:05 -0400
committerFurkan Sahin <furkan-dev@proton.me>2016-08-20 12:30:05 -0400
commit55f7e124b813daa69c610bfb41f2b5df9a05ca7d (patch)
tree57de40ae3d12581251bb7499cd1e553153e15a92
parent568303fe05507d512c42f7f564e1c52464d0fe16 (diff)
parentc0d6401ab0edd8449466bbf015b9763b5d6d41c2 (diff)
Merge pull request #867 from kb100/fix-865
Avoid dereferencing null configuration
-rw-r--r--sway/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c
index 8531a337..bed233bd 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -859,7 +859,7 @@ void apply_input_config(struct input_config *ic, struct libinput_device *dev) {
}
void apply_output_config(struct output_config *oc, swayc_t *output) {
- if (oc->enabled == 0) {
+ if (oc && oc->enabled == 0) {
destroy_output(output);
return;
}