ui: fix drive move down not working on mac

utmapp · Feb 26, 2021 · 54153f7 · 54153f7
1 parent b8155e9
commit 54153f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Configuration/UTMConfiguration+Drives.m b/Configuration/UTMConfiguration+Drives.m
@@ -191,9 +191,6 @@ - (void)moveDriveIndex:(NSInteger)index to:(NSInteger)newIndex {
  NSMutableDictionary *drive = self.rootDict[kUTMConfigDrivesKey][index];
  [self propertyWillChange];
  [self.rootDict[kUTMConfigDrivesKey] removeObjectAtIndex:index];
- if (index < newIndex) {
- newIndex--;
- }
  [self.rootDict[kUTMConfigDrivesKey] insertObject:drive atIndex:newIndex];
 }
 

diff --git a/Managers/UTMQemuSystem.m b/Managers/UTMQemuSystem.m
@@ -219,7 +219,7 @@ - (void)argsForCpu {
 }
 
 - (void)argsForDrives {
- NSInteger bootindex = 1;
+ NSInteger bootindex = 0;
  for (NSUInteger i = 0; i < self.configuration.countDrives; i++) {
  NSString *path = [self.configuration driveImagePathForIndex:i];
  UTMDiskImageType type = [self.configuration driveImageTypeForIndex:i];

diff --git a/Platform/iOS/VMConfigDrivesView.swift b/Platform/iOS/VMConfigDrivesView.swift
@@ -110,7 +110,13 @@ struct VMConfigDrivesView: View {
 
  private func moveDrives(source: IndexSet, destination: Int) {
  for offset in source {
- config.moveDrive(offset, to: destination)
+ let realDestination: Int
+ if offset < destination {
+ realDestination = destination - 1
+ } else {
+ realDestination = destination
+ }
+ config.moveDrive(offset, to: realDestination)
  }
  }
 }