fix(windows_api): correctly handle monitors preference indices

LGUG2Z · Oct 18, 2024 · e9143b2 · e9143b2
1 parent 1644fcf
commit e9143b2
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/komorebi/src/windows_api.rs b/komorebi/src/windows_api.rs
@@ -300,14 +300,21 @@ impl WindowsApi {
  }
  }
 
- if monitors.elements().is_empty() {
- monitors.elements_mut().push_back(m);
- } else if let Some(preference) = index_preference {
- while *preference > monitors.elements().len() {
+ if let Some(preference) = index_preference {
+ while *preference >= monitors.elements().len() {
  monitors.elements_mut().push_back(Monitor::placeholder());
  }
 
- monitors.elements_mut().insert(*preference, m);
+ let current_name = monitors
+ .elements_mut()
+ .get(*preference)
+ .map_or("", |m| m.name());
+ if current_name == "PLACEHOLDER" {
+ let _ = monitors.elements_mut().remove(*preference);
+ monitors.elements_mut().insert(*preference, m);
+ } else {
+ monitors.elements_mut().insert(*preference, m);
+ }
  } else {
  monitors.elements_mut().push_back(m);
  }