Reuse same ID when reconnecting monitor, otherwise use minimum available ID (#2666)

Fixes #2601

1 files changed, 3 insertions, 1 deletions

diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 6f1be1b6..e4f5483f 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -101,6 +101,8 @@ class CCompositor {
     std::vector<CWindow*>                     m_vWindowsFadingOut;
     std::vector<SLayerSurface*>               m_vSurfacesFadingOut;
 
+    std::unordered_map<std::string, int64_t>  m_mMonitorIDMap;
+
     void                                      initServer();
     void                                      startCompositor();
     void                                      cleanup();
@@ -168,7 +170,7 @@ class CCompositor {
     CMonitor*      getMonitorInDirection(const char&);
     void           updateAllWindowsAnimatedDecorationValues();
     void           updateWindowAnimatedDecorationValues(CWindow*);
-    int            getNextAvailableMonitorID();
+    int            getNextAvailableMonitorID(std::string const & name);
     void           moveWorkspaceToMonitor(CWorkspace*, CMonitor*);
     void           swapActiveWorkspaces(CMonitor*, CMonitor*);
     CMonitor*      getMonitorFromString(const std::string&);