Merge pull request #867 from kb100/fix-865

Avoid dereferencing null configuration
This commit is contained in:
Drew DeVault 2016-08-20 12:30:05 -04:00 committed by GitHub
commit b18c64d795

View file

@ -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) { void apply_output_config(struct output_config *oc, swayc_t *output) {
if (oc->enabled == 0) { if (oc && oc->enabled == 0) {
destroy_output(output); destroy_output(output);
return; return;
} }