From 754b90c72f8c73d8dcf7091fba82309d21aebbb5 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Tue, 24 Mar 2020 12:39:55 +0000
Subject: [PATCH] Create screens before screen edges

Summary:
Screens is used in screenEdges in a recent refactor

This didn't affect wayland as main_wayland creates screens earlier
itself. We can't move creation into main_x11 as X11's screens uses an
event filter which relies on workspace existing.

BUG: 419178

Test Plan: Restarted on X11

Reviewers: #kwin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D28233
---
 workspace.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workspace.cpp b/workspace.cpp
index 6f1fcc9b46..66818ee622 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -159,6 +159,7 @@ Workspace::Workspace(const QString &sessionKey)
 
     RuleBook::create(this)->load();
 
+    kwinApp()->createScreens();
     ScreenEdges::create(this);
 
     // VirtualDesktopManager needs to be created prior to init shortcuts
@@ -198,7 +199,6 @@ Workspace::Workspace(const QString &sessionKey)
 void Workspace::init()
 {
     KSharedConfigPtr config = kwinApp()->config();
-    kwinApp()->createScreens();
     Screens *screens = Screens::self();
     // get screen support
     connect(screens, SIGNAL(changed()), SLOT(desktopResized()));