SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Fix system detection logging

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-03 09:52:42 -05:00
parent ac649af511
commit fb2b1b7c54
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -161,6 +161,7 @@
- Fix misunderstanding on perfect offset
- Handle SCSI error count
- Update to DIC 20250101
- Fix system detection logging
### 3.2.4 (2024-11-24)

17
MPF.Frontend/ViewModels/MainViewModel.cs
View File

@@ -1261,7 +1261,8 @@ namespace MPF.Frontend.ViewModels
{
VerboseLog($"Trying to detect system for drive {CurrentDrive.Name}.. ");
var currentSystem = GetRedumpSystem(CurrentDrive);
VerboseLogLn(currentSystem == null ? $"unable to detect, defaulting to {Options.DefaultSystem.LongName()}" : ($"detected {currentSystem.LongName()}."));
if (currentSystem != null)
VerboseLogLn($"detected {currentSystem.LongName()}.");
// If undetected system on inactive drive, and PC is the default system, check for potential Mac disc
if (currentSystem == null && CurrentDrive.MarkedActive == false && Options.DefaultSystem == RedumpSystem.IBMPCcompatible)
@@ -1270,14 +1271,20 @@ namespace MPF.Frontend.ViewModels
{
// If disc is readable on inactive drive, assume it is a Mac disc
if (PhysicalTool.GetFirstBytes(CurrentDrive, 1) != null)
{
currentSystem = RedumpSystem.AppleMacintosh;
VerboseLogLn($"unable to detect, defaulting to {currentSystem.LongName()}.");
}
}
catch {}
catch { }
}
// Fallback to default system only if drive is active
if (currentSystem == null && CurrentDrive.MarkedActive)
{
currentSystem = Options.DefaultSystem;
VerboseLogLn($"unable to detect, defaulting to {currentSystem.LongName()}.");
}
if (currentSystem != null)
{
@@ -1500,7 +1507,7 @@ namespace MPF.Frontend.ViewModels
return detectedSegaSystem;
}
}
catch {}
catch { }
// Otherwise, return null
return null;
@@ -1651,8 +1658,8 @@ namespace MPF.Frontend.ViewModels
return segaSystem;
}
}
catch {}
catch { }
// Sega Dreamcast
if (File.Exists(Path.Combine(drive.Name, "IP.BIN")))
{