diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2016-08-20 12:30:05 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-20 12:30:05 -0400 |
| commit | b18c64d795f7158a66085babce33580091eebde3 (patch) | |
| tree | 57de40ae3d12581251bb7499cd1e553153e15a92 | |
| parent | Merge pull request #862 from goetzc/master (diff) | |
| parent | Avoid dereferencing null configuration (diff) | |
| download | sway-b18c64d795f7158a66085babce33580091eebde3.tar.gz sway-b18c64d795f7158a66085babce33580091eebde3.tar.zst sway-b18c64d795f7158a66085babce33580091eebde3.zip | |
Merge pull request #867 from kb100/fix-865
Avoid dereferencing null configuration
| -rw-r--r-- | sway/config.c | 2 |
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) { | |||
| 859 | } | 859 | } |
| 860 | 860 | ||
| 861 | void apply_output_config(struct output_config *oc, swayc_t *output) { | 861 | void apply_output_config(struct output_config *oc, swayc_t *output) { |
| 862 | if (oc->enabled == 0) { | 862 | if (oc && oc->enabled == 0) { |
| 863 | destroy_output(output); | 863 | destroy_output(output); |
| 864 | return; | 864 | return; |
| 865 | } | 865 | } |