diff options
| author | Brian Ashworth <[email protected]> | 2019-03-12 13:57:40 -0400 |
|---|---|---|
| committer | emersion <[email protected]> | 2019-03-12 19:14:04 +0100 |
| commit | 3330faded5ed59b19b2a1982bb52c05322b03510 (patch) | |
| tree | f6acaeb4793ff21534e84ea5b9b37bf87ddf7f91 /sway/tree/root.c | |
| parent | a280facd5fb1c07dab97bbef1d8db534edf7dfa6 (diff) | |
Handle seat_get_focused_workspace returning NULL
This modifiers the callers of seat_get_focused_workspace to handle
getting NULL as the return value, if they did not already.
Diffstat (limited to 'sway/tree/root.c')
| -rw-r--r-- | sway/tree/root.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/tree/root.c b/sway/tree/root.c index 6e13d6ce..0744192b 100644 --- a/sway/tree/root.c +++ b/sway/tree/root.c @@ -96,6 +96,10 @@ void root_scratchpad_remove_container(struct sway_container *con) { void root_scratchpad_show(struct sway_container *con) { struct sway_seat *seat = input_manager_current_seat(); struct sway_workspace *new_ws = seat_get_focused_workspace(seat); + if (!new_ws) { + sway_log(SWAY_DEBUG, "No focused workspace to show scratchpad on"); + return; + } struct sway_workspace *old_ws = con->workspace; // If the current con or any of its parents are in fullscreen mode, we |