desktop-shell: Avoid retrieving output's width/height if none present
authorMarius Vlad <marius.vlad@collabora.com>
Fri, 27 Mar 2020 22:23:14 +0000 (00:23 +0200)
committerDaniel Stone <daniels@collabora.com>
Tue, 23 Jun 2020 10:36:47 +0000 (10:36 +0000)
As in some circumstances there could be no output connected, avoid
retrieving the width/height of the output if none was found/connected.

Fixes: #384
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
desktop-shell/shell.c

index 442a625f8da6ab45e16b275043ec90bb41f86051..ef0696ed526732206d1b8417f95a45136aac1152 100644 (file)
@@ -2697,8 +2697,10 @@ set_fullscreen(struct shell_surface *shsurf, bool fullscreen,
                shell_surface_set_output(shsurf, output);
                shsurf->fullscreen_output = shsurf->output;
 
-               width = shsurf->output->width;
-               height = shsurf->output->height;
+               if (shsurf->output) {
+                       width = shsurf->output->width;
+                       height = shsurf->output->height;
+               }
        } else if (weston_desktop_surface_get_maximized(desktop_surface)) {
                get_maximized_size(shsurf, &width, &height);
        }