diff --git a/DICUI.Library/Utilities/DumpEnvironment.cs b/DICUI.Library/Utilities/DumpEnvironment.cs index 2bf58424..eb4b7fc5 100644 --- a/DICUI.Library/Utilities/DumpEnvironment.cs +++ b/DICUI.Library/Utilities/DumpEnvironment.cs @@ -23,6 +23,12 @@ namespace DICUI.Utilities { #region Tool paths + /// + /// Path to DiscImageCreator executable + /// + /// DiscImageCreator is both used as an internal tool and an extra tool + public string DiscImageCreatorPath { get; set; } + /// /// Path to Subdump executable /// @@ -160,6 +166,7 @@ namespace DICUI.Utilities string parameters) { // Tool paths + this.DiscImageCreatorPath = options.CreatorPath; this.SubdumpPath = options.SubDumpPath; // Output paths @@ -259,12 +266,12 @@ namespace DICUI.Utilities } /// - /// Eject the disc using DIC + /// Eject the disc using DiscImageCreator /// public async void EjectDisc() { // Validate that the required program exists - if (!File.Exists(Parameters.Path)) + if (!File.Exists(this.DiscImageCreatorPath)) return; CancelDumping(); @@ -277,6 +284,7 @@ namespace DICUI.Utilities { BaseCommand = DiscImageCreator.Command.Eject, DriveLetter = Drive.Letter.ToString(), + Path = this.DiscImageCreatorPath, }; await ExecuteInternalProgram(parameters); @@ -400,12 +408,12 @@ namespace DICUI.Utilities } /// - /// Reset the current drive using DIC + /// Reset the current drive using DiscImageCreator /// public async void ResetDrive() { // Validate that the required program exists - if (!File.Exists(Parameters.Path)) + if (!File.Exists(this.DiscImageCreatorPath)) return; // Precautionary check for dumping, just in case @@ -419,6 +427,7 @@ namespace DICUI.Utilities { BaseCommand = DiscImageCreator.Command.Reset, DriveLetter = Drive.Letter.ToString(), + Path = this.DiscImageCreatorPath, }; await ExecuteInternalProgram(parameters); diff --git a/DICUI/Windows/MainWindow.xaml.cs b/DICUI/Windows/MainWindow.xaml.cs index 638f84a2..ebc85f5e 100644 --- a/DICUI/Windows/MainWindow.xaml.cs +++ b/DICUI/Windows/MainWindow.xaml.cs @@ -546,8 +546,8 @@ namespace DICUI.Windows _uiOptions.Options.ResetDriveAfterDump, (si) => { - // lazy initialization - if (_discInformationWindow == null) + // lazy initialization + if (_discInformationWindow == null) { _discInformationWindow = new DiscInformationWindow(this, si); _discInformationWindow.Closed += delegate