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 eject and reset

Browse Source
This commit is contained in:
Matt Nadareski
2020-05-06 16:06:30 -07:00
parent dc90f9af3f
commit 230b6ca721
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DICUI.Library/Utilities/DumpEnvironment.cs
View File

@@ -23,6 +23,12 @@ namespace DICUI.Utilities
{
#region Tool paths
/// <summary>
/// Path to DiscImageCreator executable
/// </summary>
/// <remarks>DiscImageCreator is both used as an internal tool and an extra tool</remarks>
public string DiscImageCreatorPath { get; set; }
/// <summary>
/// Path to Subdump executable
/// </summary>
@@ -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
}
/// <summary>
/// Eject the disc using DIC
/// Eject the disc using DiscImageCreator
/// </summary>
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
}
/// <summary>
/// Reset the current drive using DIC
/// Reset the current drive using DiscImageCreator
/// </summary>
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);

4
DICUI/Windows/MainWindow.xaml.cs
View File

@@ -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