output: ensure we don't run into an assert() on VT switch

Also reduce log spam from failed output commits that
can happen for various reasons outside of our control.

Fixes: #1667

diff --git a/src/common/scene-helpers.c b/src/common/scene-helpers.c
index b8a7ac476edddde098eb30b8e03556e21388744c..6c7ed9ea364dbb2e29e30292891797d7546bb828 100644 (file)
--- a/src/common/scene-helpers.c
+++ b/src/common/scene-helpers.c
@@ -55,7 +55,7 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output)
                return false;
        }
        if (!wlr_output_commit(wlr_output)) {
-               wlr_log(WLR_ERROR, "Failed to commit output %s",
+               wlr_log(WLR_INFO, "Failed to commit output %s",
                        wlr_output->name);
                return false;
        }

diff --git a/src/output.c b/src/output.c
index e81abaee46cd50884fb7207da9e0b5823d572967..67d8de7764667e71abaaa5cdb76259afd496f4a6 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -60,6 +60,17 @@ output_frame_notify(struct wl_listener *listener, void *data)
                return;
        }
 
+       if (!output->scene_output) {
+               /*
+                * TODO: This is a short term fix for issue #1667,
+                *       a proper fix would require restructuring
+                *       the life cycle of scene outputs, e.g.
+                *       creating them on new_output_notify() only.
+                */
+               wlr_log(WLR_INFO, "Failed to render new frame: no scene-output");
+               return;
+       }
+
        struct wlr_output *wlr_output = output->wlr_output;
        struct server *server = output->server;