From 861eac9205071754dd4be3dc71c866338df45e32 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Mon, 10 Jan 2022 11:10:18 +0200 Subject: [PATCH] Clean up Workspace::activeOutput() Having both "active_client" and "client" is leftover after the active output property being in the Screens class. --- src/workspace.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/workspace.cpp b/src/workspace.cpp index 2f4efe9c1e..9f9b522d22 100644 --- a/src/workspace.cpp +++ b/src/workspace.cpp @@ -2416,9 +2416,8 @@ AbstractOutput *Workspace::activeOutput() const return kwinApp()->platform()->outputAt(Cursors::self()->mouse()->pos()); } - AbstractClient *client = Workspace::self()->activeClient(); - if (active_client && !client->isOnOutput(m_activeOutput)) { - return client->output(); + if (active_client && !active_client->isOnOutput(m_activeOutput)) { + return active_client->output(); } return m_activeOutput;