1 files changed, 17 insertions, 17 deletions

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index e8abe30d..30d982fb 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -53,7 +53,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
         PMONITOR = g_pCompositor->m_pLastMonitor.lock();
     }
     auto PWORKSPACE           = PMONITOR->activeSpecialWorkspace ? PMONITOR->activeSpecialWorkspace : PMONITOR->activeWorkspace;
-    PWINDOW->m_iMonitorID     = PMONITOR->ID;
+    PWINDOW->m_pMonitor       = PMONITOR;
     PWINDOW->m_pWorkspace     = PWORKSPACE;
     PWINDOW->m_bIsMapped      = true;
     PWINDOW->m_bReadyToDelete = false;
@@ -144,18 +144,18 @@ void Events::listener_mapWindow(void* owner, void* data) {
                 const auto MONITORSTR = trim(r.szRule.substr(r.szRule.find(' ')));
 
                 if (MONITORSTR == "unset") {
-                    PWINDOW->m_iMonitorID = PMONITOR->ID;
+                    PWINDOW->m_pMonitor = PMONITOR;
                 } else {
                     if (isNumber(MONITORSTR)) {
                         const MONITORID MONITOR = std::stoi(MONITORSTR);
-                        if (!g_pCompositor->getMonitorFromID(MONITOR))
-                            PWINDOW->m_iMonitorID = 0;
+                        if (const auto PM = g_pCompositor->getMonitorFromID(MONITOR); PM)
+                            PWINDOW->m_pMonitor = PM;
                         else
-                            PWINDOW->m_iMonitorID = MONITOR;
+                            PWINDOW->m_pMonitor = g_pCompositor->m_vMonitors.at(0);
                     } else {
                         const auto PMONITOR = g_pCompositor->getMonitorFromName(MONITORSTR);
                         if (PMONITOR)
-                            PWINDOW->m_iMonitorID = PMONITOR->ID;
+                            PWINDOW->m_pMonitor = PMONITOR;
                         else {
                             Debug::log(ERR, "No monitor in monitor {} rule", MONITORSTR);
                             continue;
@@ -163,10 +163,10 @@ void Events::listener_mapWindow(void* owner, void* data) {
                     }
                 }
 
-                const auto PMONITORFROMID = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
+                const auto PMONITORFROMID = PWINDOW->m_pMonitor.lock();
 
-                if (PWINDOW->m_iMonitorID != PMONITOR->ID) {
-                    g_pKeybindManager->m_mDispatchers["focusmonitor"](std::to_string(PWINDOW->m_iMonitorID));
+                if (PWINDOW->m_pMonitor != PMONITOR) {
+                    g_pKeybindManager->m_mDispatchers["focusmonitor"](std::to_string(PWINDOW->monitorID()));
                     PMONITOR = PMONITORFROMID;
                 }
                 PWINDOW->m_pWorkspace = PMONITOR->activeSpecialWorkspace ? PMONITOR->activeSpecialWorkspace : PMONITOR->activeWorkspace;
@@ -296,19 +296,19 @@ void Events::listener_mapWindow(void* owner, void* data) {
             auto pWorkspace = g_pCompositor->getWorkspaceByID(REQUESTEDWORKSPACEID);
 
             if (!pWorkspace)
-                pWorkspace = g_pCompositor->createNewWorkspace(REQUESTEDWORKSPACEID, PWINDOW->m_iMonitorID, requestedWorkspaceName);
+                pWorkspace = g_pCompositor->createNewWorkspace(REQUESTEDWORKSPACEID, PWINDOW->monitorID(), requestedWorkspaceName);
 
             PWORKSPACE = pWorkspace;
 
             PWINDOW->m_pWorkspace = pWorkspace;
-            PWINDOW->m_iMonitorID = pWorkspace->m_iMonitorID;
+            PWINDOW->m_pMonitor   = pWorkspace->m_pMonitor;
 
-            if (g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID)->activeSpecialWorkspace && !pWorkspace->m_bIsSpecialWorkspace)
+            if (PWINDOW->m_pMonitor.lock()->activeSpecialWorkspace && !pWorkspace->m_bIsSpecialWorkspace)
                 workspaceSilent = true;
 
             if (!workspaceSilent) {
                 if (pWorkspace->m_bIsSpecialWorkspace)
-                    g_pCompositor->getMonitorFromID(pWorkspace->m_iMonitorID)->setSpecialWorkspace(pWorkspace);
+                    pWorkspace->m_pMonitor->setSpecialWorkspace(pWorkspace);
                 else if (PMONITOR->activeWorkspaceID() != REQUESTEDWORKSPACEID)
                     g_pKeybindManager->m_mDispatchers["workspace"](requestedWorkspaceName);
 
@@ -574,7 +574,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
         g_pLayoutManager->getCurrentLayout()->onWindowRemoved(SWALLOWER);
         g_pHyprRenderer->damageWindow(SWALLOWER);
         SWALLOWER->setHidden(true);
-        g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PWINDOW->m_iMonitorID);
+        g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PWINDOW->monitorID());
     }
 
     PWINDOW->m_bFirstMap = false;
@@ -635,7 +635,7 @@ void Events::listener_unmapWindow(void* owner, void* data) {
         return;
     }
 
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
+    const auto PMONITOR = PWINDOW->m_pMonitor.lock();
     if (PMONITOR) {
         PWINDOW->m_vOriginalClosedPos     = PWINDOW->m_vRealPosition.value() - PMONITOR->vecPosition;
         PWINDOW->m_vOriginalClosedSize    = PWINDOW->m_vRealSize.value();
@@ -773,7 +773,7 @@ void Events::listener_commitWindow(void* owner, void* data) {
     if (!PWINDOW->m_pWorkspace->m_bVisible)
         return;
 
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID);
+    const auto PMONITOR = PWINDOW->m_pMonitor.lock();
 
     if (PMONITOR)
         PMONITOR->debugLastPresentation(g_pSeatManager->isPointerFrameCommit ? "listener_commitWindow skip" : "listener_commitWindow");
@@ -911,7 +911,7 @@ void Events::listener_unmanagedSetGeometry(void* owner, void* data) {
             PWINDOW->m_vRealSize.setValueAndWarp(PWINDOW->m_pXWaylandSurface->geometry.size());
 
         if (*PXWLFORCESCALEZERO) {
-            if (const auto PMONITOR = g_pCompositor->getMonitorFromID(PWINDOW->m_iMonitorID); PMONITOR) {
+            if (const auto PMONITOR = PWINDOW->m_pMonitor.lock(); PMONITOR) {
                 PWINDOW->m_vRealSize.setValueAndWarp(PWINDOW->m_vRealSize.goal() / PMONITOR->scale);
             }
         }