aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2016-08-20 12:30:05 -0400
committerGitHub <noreply@github.com>2016-08-20 12:30:05 -0400
commitb18c64d795f7158a66085babce33580091eebde3 (patch)
tree57de40ae3d12581251bb7499cd1e553153e15a92 /sway
parentf99992a8ae09e3a988f92558824fa1dc580a55cf (diff)
parent8af49eb696b76adebb17fb9223027d790a0f6567 (diff)
Merge pull request #867 from kb100/fix-865
Avoid dereferencing null configuration
Diffstat (limited to 'sway')
-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;
}