summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2019-03-06 10:47:50 +0100
committerDrew DeVault <sir@cmpwn.com>2019-03-11 10:56:20 -0400
commit8dfdb3fa112544c52fa86ec46e05c4d0eaab6a92 (patch)
treeff7ea437821c4857fbd51eeda5d0362c01c6919b
parent7a44b542b8ec8c1c03f7db81eb96c20105c83ffb (diff)
Fix container_parent_layout for scratchpad windows
-rw-r--r--sway/tree/container.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 330439411..a6142193f 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -1163,7 +1163,10 @@ enum sway_container_layout container_parent_layout(struct sway_container *con) {
if (con->parent) {
return con->parent->layout;
}
- return con->workspace->layout;
+ if (con->workspace) {
+ return con->workspace->layout;
+ }
+ return L_NONE;
}
enum sway_container_layout container_current_parent_layout(