data: update stale vm when container path changes

Fixes #4392
utmapp · Sep 10, 2022 · 39b8c17 · 39b8c17
1 parent 8bbadc7
commit 39b8c17
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Platform/UTMData.swift b/Platform/UTMData.swift
@@ -140,9 +140,19 @@ class UTMData: ObservableObject {
                 let vm = UTMVirtualMachine(url: file)
                 if let vm = vm {
                     if uuidHasCollision(with: vm, in: list) {
-                        await uuidRegenerate(for: vm)
+                        if let index = list.firstIndex(where: { $0 is UTMWrappedVirtualMachine && $0.id == vm.id }) {
+                            // we have a stale VM with the same UUID, so we replace that entry with this one
+                            list[index] = vm
+                            // update the registry with the new bookmark
+                            try? await vm.updateRegistryFromConfig()
+                        } else {
+                            // duplicate is not stale so we need a new UUID
+                            await uuidRegenerate(for: vm)
+                            list.insert(vm, at: 0)
+                        }
+                    } else {
+                        list.insert(vm, at: 0)
                     }
-                    list.insert(vm, at: 0)
                 } else {
                     logger.error("Failed to create object for \(file)")
                 }