Require staging directory as fallback (#34)

* Test requiring staging directory on Windows

* Special workaround v1

* Remove variable since its only used once
This commit is contained in:
Dagg 2023-03-18 21:38:21 -07:00 committed by GitHub
parent 47af7d6929
commit 7b88e27843
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -29,9 +29,12 @@ public class ModeSelectionForm : Form {
private void openRemotePatcher(object sender, EventArgs e)
{
if (OSUtil.GetPlatform() == OSPlatform.OSX)
if (!Directory.Exists("scetool"))
{
Gui.CreateOkDialog("Workaround", "UnionPatcher RemotePatcher requires a staging folder on macOS, please set this to the directory of the UnionPatcher app!");
// This will always occur on macOS, so don't show this message for macOS users.
if (OSUtil.GetPlatform() != OSPlatform.OSX) Gui.CreateOkDialog("Workaround Triggered", ".NET could not locate the required files, triggering workaround.");
Gui.CreateOkDialog("Workaround", "UnionPatcher RemotePatcher requires a staging folder on macOS or in special circumstances on Windows, please set this to the directory of the UnionPatcher app or executable!");
SelectFolderDialog dialog = new SelectFolderDialog();
if (dialog.ShowDialog(this) != DialogResult.Ok)
{
@ -41,7 +44,7 @@ public class ModeSelectionForm : Form {
Directory.SetCurrentDirectory(dialog.Directory);
if (!Directory.Exists("scetool"))
{
Gui.CreateOkDialog("Workaround", "Invalid folder, remember to set the folder to the directory of the UnionPatcher app!");
Gui.CreateOkDialog("Workaround", "Invalid folder, remember to set the folder to the directory of the UnionPatcher app or executable!");
return;
}
}