diff options
| author |  Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-08-08 15:36:17 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-08 15:36:17 -0400 |
| commit | fc039f0759c1293fc270b631b035176f6924797b (patch) | |
| tree | a4676629358071b0f0748dde33a32d82c9a58175 | |
| parent | 私の日本語が上手じゃないですね (diff) | |
| parent | Merge branch 'master' into master (diff) | |
| download | sway-fc039f0759c1293fc270b631b035176f6924797b.tar.gz sway-fc039f0759c1293fc270b631b035176f6924797b.tar.zst sway-fc039f0759c1293fc270b631b035176f6924797b.zip | |
Merge pull request #2423 from manio/master
[RFC] Fix segv when sway is terminating
| -rw-r--r-- | sway/tree/view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/view.c b/sway/tree/view.c index faaa53a1..950494d8 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
| @@ -603,7 +603,7 @@ void view_unmap(struct sway_view *view) { | |||
| 603 | struct sway_container *surviving_ancestor = container_destroy(view->swayc); | 603 | struct sway_container *surviving_ancestor = container_destroy(view->swayc); |
| 604 | 604 | ||
| 605 | // If the workspace wasn't reaped | 605 | // If the workspace wasn't reaped |
| 606 | if (surviving_ancestor->type >= C_WORKSPACE) { | 606 | if (surviving_ancestor && surviving_ancestor->type >= C_WORKSPACE) { |
| 607 | struct sway_container *ws = surviving_ancestor->type == C_WORKSPACE ? | 607 | struct sway_container *ws = surviving_ancestor->type == C_WORKSPACE ? |
| 608 | surviving_ancestor : | 608 | surviving_ancestor : |
| 609 | container_parent(surviving_ancestor, C_WORKSPACE); | 609 | container_parent(surviving_ancestor, C_WORKSPACE); |