From c5d22b68b67f13c4115dbf02543ace5036dd92ed Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 25 Aug 2021 20:48:49 +0300 Subject: [PATCH] wayland: Simplify startup sequence If there are no outputs, the drm backend will create a placeholder output, so continueStartupWithScreens() can be removed. --- src/main_wayland.cpp | 10 ---------- src/main_wayland.h | 1 - 2 files changed, 11 deletions(-) diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp index 147a84457f..ee3f79f0fd 100644 --- a/src/main_wayland.cpp +++ b/src/main_wayland.cpp @@ -174,16 +174,6 @@ void ApplicationWayland::performStartup() void ApplicationWayland::continueStartupWithScene() { disconnect(Compositor::self(), &Compositor::sceneCreated, this, &ApplicationWayland::continueStartupWithScene); - if (!platform()->enabledOutputs().isEmpty()) { - continueStartupWithScreens(); - } else { - connect(platform(), &Platform::screensQueried, this, &ApplicationWayland::continueStartupWithScreens); - } -} - -void ApplicationWayland::continueStartupWithScreens() -{ - disconnect(platform(), &Platform::screensQueried, this, &ApplicationWayland::continueStartupWithScreens); // Note that we start accepting client connections after creating the Workspace. createWorkspace(); diff --git a/src/main_wayland.h b/src/main_wayland.h index bfbcfc1093..c559abedb6 100644 --- a/src/main_wayland.h +++ b/src/main_wayland.h @@ -60,7 +60,6 @@ protected: void performStartup() override; private: - void continueStartupWithScreens(); void continueStartupWithScene(); void finalizeStartup(); void startSession() override;