src: Further hotplug connector fixes

[src/agl-compositor.git] / src / compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 15fd42a..1f45a71 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -87,7 +87,8 @@ handle_output_destroy(struct wl_listener *listener, void *data)
        output = wl_container_of(listener, output, output_destroy);
        assert(output->output == data);
 
-       if (output->fullscreen_view.fs->view) {
+       if (output->fullscreen_view.fs &&
+           output->fullscreen_view.fs->view) {
                weston_surface_destroy(output->fullscreen_view.fs->view->surface);
                output->fullscreen_view.fs->view = NULL;
        }
@@ -1829,7 +1830,12 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da
        weston_compositor_wake(ivi.compositor);
 
        ivi_shell_create_global(&ivi);
-       ivi_launch_shell_client(&ivi);
+
+       ivi_launch_shell_client(&ivi, "shell-client",
+                               &ivi.shell_client.client);
+       ivi_launch_shell_client(&ivi, "shell-client-ext",
+                               &ivi.shell_client_ext.client);
+
        if (debug)
                ivi_screenshooter_create(&ivi);
        ivi_agl_systemd_notify(&ivi);