config: reset new drive config each time

This also fixes the bug where on iOS, it was not possible to change the interface for a new drive. Fixes #2384
utmapp · Mar 16, 2021 · d82ce72 · d82ce72
1 parent ac80212
commit d82ce72
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/Platform/Shared/VMConfigDriveCreateView.swift b/Platform/Shared/VMConfigDriveCreateView.swift
@@ -30,8 +30,7 @@ struct VMConfigDriveCreateView: View {
             Toggle(isOn: $driveImage.removable.animation(), label: {
                 Text("Removable")
             }).onChange(of: driveImage.removable) { removable in
-                driveImage.imageType = removable ? .CD : .disk
-                driveImage.interface = UTMConfiguration.defaultDriveInterface(forTarget: target, type: driveImage.imageType)
+                driveImage.reset(forSystemTarget: target, removable: removable)
             }
             VMConfigStringPicker(selection: $driveImage.interface, label: Text("Interface"), rawValues: UTMConfiguration.supportedDriveInterfaces(), displayValues: UTMConfiguration.supportedDriveInterfacesPretty())
             if !driveImage.removable {
@@ -50,8 +49,6 @@ struct VMConfigDriveCreateView: View {
                     }).buttonStyle(PlainButtonStyle())
                 }
             }
-        }.onAppear() {
-            driveImage.interface = UTMConfiguration.defaultDriveInterface(forTarget: target, type: driveImage.imageType)
         }
     }
 

diff --git a/Platform/Shared/VMDriveImage.swift b/Platform/Shared/VMDriveImage.swift
@@ -30,4 +30,11 @@ class VMDriveImage: ObservableObject {
             imageTypeString = newValue.description
         }
     }
+
+    func reset(forSystemTarget target: String?, removable: Bool) {
+        self.removable = removable
+        self.imageType = removable ? .CD : .disk
+        self.interface = UTMConfiguration.defaultDriveInterface(forTarget: target, type: imageType)
+        self.size = removable ? 0 : 10240
+    }
 }
diff --git a/Platform/iOS/VMConfigDrivesView.swift b/Platform/iOS/VMConfigDrivesView.swift
@@ -144,6 +144,9 @@ private struct CreateDrive: View {
                     Text("Done")
                 }))
         }.navigationViewStyle(StackNavigationViewStyle())
+        .onAppear {
+            driveImage.reset(forSystemTarget: target, removable: false)
+        }
     }
 
     private func cancel() {

diff --git a/Platform/macOS/VMConfigDrivesView.swift b/Platform/macOS/VMConfigDrivesView.swift
@@ -35,6 +35,11 @@ struct VMConfigDrivesView: View {
                 Button(action: { newDrivePopover.toggle() }, label: {
                     Label("New Drive", systemImage: "plus").labelStyle(TitleOnlyLabelStyle())
                 })
+                .onChange(of: newDrivePopover, perform: { showPopover in
+                    if showPopover {
+                        newDrive.reset(forSystemTarget: config.systemTarget, removable: false)
+                    }
+                })
                 .popover(isPresented: $newDrivePopover, arrowEdge: .bottom) {
                     VStack {
                         VMConfigDriveCreateView(target: config.systemTarget, driveImage: newDrive)