From c033ac108d78d48bbdf3877ddfb6cad711dd74e9 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 20 Nov 2025 14:15:46 +0000 Subject: [PATCH] [GUI] Enable opening media dump window from device view. --- .../ViewModels/Windows/DeviceViewModel.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Aaru.Gui/ViewModels/Windows/DeviceViewModel.cs b/Aaru.Gui/ViewModels/Windows/DeviceViewModel.cs index 4f91aa64b..b0af73e78 100644 --- a/Aaru.Gui/ViewModels/Windows/DeviceViewModel.cs +++ b/Aaru.Gui/ViewModels/Windows/DeviceViewModel.cs @@ -84,6 +84,7 @@ public partial class DeviceViewModel : ViewModelBase string _devicePath; [ObservableProperty] string _deviceType; + DeviceInfo _devInfo; [ObservableProperty] DvdInfo _dvdInfo; [ObservableProperty] @@ -429,6 +430,8 @@ public partial class DeviceViewModel : ViewModelBase var devInfo = new DeviceInfo(dev); Statistics.AddCommand("device-info"); + _devInfo = devInfo; + Dispatcher.UIThread.Invoke(() => StatusMessage = UI.Device_information_queryied_successfully); if(devInfo.IsUsb) @@ -985,38 +988,35 @@ public partial class DeviceViewModel : ViewModelBase async Task DumpAsync() { - /* - switch(_scsiInfo.MediaType) + switch(_mediaInfo?.MediaType) { case CommonTypes.MediaType.GDR or CommonTypes.MediaType.GDROM: await MessageBoxManager - .GetMessageBoxStandard(Localization.UI.Title_Error, + .GetMessageBoxStandard(UI.Title_Error, Localization.Core.GD_ROM_dump_support_is_not_yet_implemented, ButtonEnum.Ok, Icon.Error) - .ShowWindowDialogAsync(_view); + .ShowWindowDialogAsync(_window); return; case CommonTypes.MediaType.XGD or CommonTypes.MediaType.XGD2 or CommonTypes.MediaType.XGD3 - when _scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true: + when _mediaInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true: await MessageBoxManager - .GetMessageBoxStandard(Localization.UI.Title_Error, + .GetMessageBoxStandard(UI.Title_Error, Localization.Core .Dumping_Xbox_Game_Discs_requires_a_drive_with_Kreon_firmware, ButtonEnum.Ok, Icon.Error) - .ShowWindowDialogAsync(_view); + .ShowWindowDialogAsync(_window); return; } var mediaDumpWindow = new MediaDump(); - mediaDumpWindow.DataContext = - new MediaDumpViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaDumpWindow, _scsiInfo); + mediaDumpWindow.DataContext = new MediaDumpViewModel(_dev, DevicePath, _devInfo, mediaDumpWindow, _mediaInfo); - mediaDumpWindow.Show(); - */ + await mediaDumpWindow.ShowDialog(_window); } async Task ScanAsync()