twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-05 22:51:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

internal: move workspace special check higher in changeWorkspace

Browse Source
This commit is contained in:
vaxerski
2023-04-17 13:32:35 +01:00
parent 785fc8d669
commit 7c36a3e167
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/helpers/Monitor.cpp
View File

@@ -492,6 +492,11 @@ void CMonitor::changeWorkspace(CWorkspace* const pWorkspace, bool internal) {
if (!pWorkspace) if (!pWorkspace)
return; return;
if (pWorkspace->m_bIsSpecialWorkspace) {
Debug::log(ERR, "BUG THIS: Attempted to changeWorkspace to special!");
return;
}
if (pWorkspace->m_iID == activeWorkspace) { if (pWorkspace->m_iID == activeWorkspace) {
// in some cases (e.g. workspace from one monitor to another) // in some cases (e.g. workspace from one monitor to another)
// we need to send this // we need to send this
@@ -500,11 +505,6 @@ void CMonitor::changeWorkspace(CWorkspace* const pWorkspace, bool internal) {
return; return;
} }
if (pWorkspace->m_bIsSpecialWorkspace) {
Debug::log(ERR, "BUG THIS: Attempted to changeWorkspace to special!");
return;
}
const auto POLDWORKSPACE = g_pCompositor->getWorkspaceByID(activeWorkspace); const auto POLDWORKSPACE = g_pCompositor->getWorkspaceByID(activeWorkspace);
activeWorkspace = pWorkspace->m_iID; activeWorkspace = pWorkspace->m_iID;