Cast to DriveItem to check DeviceID

d2dyno1 · d2dyno1 · commit 8de2f0cd3f51 · 2025-03-15T20:44:48.000+01:00
diff --git a/src/Files.App/Data/Models/DrivesViewModel.cs b/src/Files.App/Data/Models/DrivesViewModel.cs
@@ -63,7 +63,7 @@ private void Watcher_DeviceRemoved(object? sender, string e)
 			logger.LogInformation($"Drive removed: {e}");
 			lock (Drives)
 			{
-				var drive = Drives.FirstOrDefault(x => x.Id == e);
+				var drive = Drives.FirstOrDefault(x => (x as DriveItem)?.DeviceID == e);
 				if (drive is not null)
 					Drives.Remove(drive);
 			}
@@ -78,7 +78,7 @@ private void Watcher_DeviceAdded(object? sender, IFolder e)
 			{
 				// If drive already in list, remove it first.
 				var matchingDrive = Drives.FirstOrDefault(x =>
-					x.Id == e.Id ||
+					(x as DriveItem)?.DeviceID == (e as DriveItem)?.DeviceID ||
 					string.IsNullOrEmpty(e.Id)
 						? x.Id.Contains(e.Name, StringComparison.OrdinalIgnoreCase)
 						: Path.GetFullPath(x.Id) == Path.GetFullPath(e.Id)

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private void Watcher_DeviceRemoved(object? sender, string e)`
`63`	`63`	`logger.LogInformation($"Drive removed: {e}");`
`64`	`64`	`lock (Drives)`
`65`	`65`	`{`
`66`		`- var drive = Drives.FirstOrDefault(x => x.Id == e);`
	`66`	`+ var drive = Drives.FirstOrDefault(x => (x as DriveItem)?.DeviceID == e);`
`67`	`67`	`if (drive is not null)`
`68`	`68`	`Drives.Remove(drive);`
`69`	`69`	`}`
`@@ -78,7 +78,7 @@ private void Watcher_DeviceAdded(object? sender, IFolder e)`
`78`	`78`	`{`
`79`	`79`	`// If drive already in list, remove it first.`
`80`	`80`	`var matchingDrive = Drives.FirstOrDefault(x =>`
`81`		`- x.Id == e.Id \|\|`
	`81`	`+ (x as DriveItem)?.DeviceID == (e as DriveItem)?.DeviceID \|\|`
`82`	`82`	`string.IsNullOrEmpty(e.Id)`
`83`	`83`	`? x.Id.Contains(e.Name, StringComparison.OrdinalIgnoreCase)`
`84`	`84`	`: Path.GetFullPath(x.Id) == Path.GetFullPath(e.Id)`