diff options
| author |  emersion <contact@emersion.fr> | 2019-01-19 00:28:45 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2019-01-19 08:29:46 +0100 |
| commit | 2ae2d09c4cbbf0834f74a3f252fd613d86c5a330 (patch) | |
| tree | c972999ed1818d7877257c108046ff4e11d72d60 /sway/desktop/output.c | |
| parent | Fix crash in cursor_rebase with multiple screens (diff) | |
| download | sway-2ae2d09c4cbbf0834f74a3f252fd613d86c5a330.tar.gz sway-2ae2d09c4cbbf0834f74a3f252fd613d86c5a330.tar.zst sway-2ae2d09c4cbbf0834f74a3f252fd613d86c5a330.zip | |
Prevent crashes in handle_transform and handle_scale too
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 37651d66..ef242a4c 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -524,7 +524,7 @@ static void handle_mode(struct wl_listener *listener, void *data) { | |||
| 524 | 524 | ||
| 525 | static void handle_transform(struct wl_listener *listener, void *data) { | 525 | static void handle_transform(struct wl_listener *listener, void *data) { |
| 526 | struct sway_output *output = wl_container_of(listener, output, transform); | 526 | struct sway_output *output = wl_container_of(listener, output, transform); |
| 527 | if (!output->enabled) { | 527 | if (!output->enabled || !output->configured) { |
| 528 | return; | 528 | return; |
| 529 | } | 529 | } |
| 530 | arrange_layers(output); | 530 | arrange_layers(output); |
| @@ -539,7 +539,7 @@ static void update_textures(struct sway_container *con, void *data) { | |||
| 539 | 539 | ||
| 540 | static void handle_scale(struct wl_listener *listener, void *data) { | 540 | static void handle_scale(struct wl_listener *listener, void *data) { |
| 541 | struct sway_output *output = wl_container_of(listener, output, scale); | 541 | struct sway_output *output = wl_container_of(listener, output, scale); |
| 542 | if (!output->enabled) { | 542 | if (!output->enabled || !output->configured) { |
| 543 | return; | 543 | return; |
| 544 | } | 544 | } |
| 545 | arrange_layers(output); | 545 | arrange_layers(output); |