diff options
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r-- | sway/desktop/output.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 0b3e1edb..b1e3464a 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -251,14 +251,11 @@ static void output_for_each_surface(struct sway_output *output, | |||
251 | }; | 251 | }; |
252 | 252 | ||
253 | struct sway_workspace *workspace = output_get_active_workspace(output); | 253 | struct sway_workspace *workspace = output_get_active_workspace(output); |
254 | if (!workspace) { | ||
255 | return; | ||
256 | } | ||
257 | struct sway_container *fullscreen_con = root->fullscreen_global; | 254 | struct sway_container *fullscreen_con = root->fullscreen_global; |
258 | if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) { | ||
259 | fullscreen_con = NULL; | ||
260 | } | ||
261 | if (!fullscreen_con) { | 255 | if (!fullscreen_con) { |
256 | if (!workspace) { | ||
257 | return; | ||
258 | } | ||
262 | fullscreen_con = workspace->current.fullscreen; | 259 | fullscreen_con = workspace->current.fullscreen; |
263 | } | 260 | } |
264 | if (fullscreen_con) { | 261 | if (fullscreen_con) { |