ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-26 08:52:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed order of code in Program.cs causing exception from creating windows form before SetCompatibleTextRenderingDefault, changed dialog boxes a bit and cleaned up validation code in SelectFolderForm

Browse Source
This commit is contained in:
PNWParksFan 2018-02-21 00:34:49 -08:00
parent d7938dd1d8
commit d82c34c542
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Program.cs
View File

@ -14,12 +14,6 @@ namespace CodeWalker
[STAThread]
static void Main(string[] args)
{
// Always check the GTA folder first thing
if(!GTAFolder.UpdateGTAFolder(Properties.Settings.Default.RememberGTAFolder))
{
MessageBox.Show("Could not load CodeWalker because no GTA 5 folder was selected. CodeWalker will now exit.", "GTA 5 Folder Not Found", MessageBoxButtons.OK, MessageBoxIcon.Stop);
return;
}
bool menumode = false;
bool explorermode = false;
@ -42,11 +36,18 @@ namespace CodeWalker
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
// Always check the GTA folder first thing
if (!GTAFolder.UpdateGTAFolder(Properties.Settings.Default.RememberGTAFolder))
{
MessageBox.Show("Could not load CodeWalker because no GTA 5 folder was selected. CodeWalker will now exit.", "GTA 5 Folder Not Found", MessageBoxButtons.OK, MessageBoxIcon.Stop);
return;
}
#if !DEBUG
try
{
#endif
if (menumode)
if (menumode)
{
Application.Run(new MenuForm());
}

10
SelectFolderForm.cs
View File

@ -51,16 +51,12 @@ namespace CodeWalker
private void OkButton_Click(object sender, EventArgs e)
{
if (!Directory.Exists(SelectedFolder))
if(!GTAFolder.ValidateGTAFolder(SelectedFolder, out string failReason))
{
MessageBox.Show("The folder \"" + SelectedFolder + "\" does not exist, or cannot be accessed. Please select another.");
return;
}
if (!File.Exists(SelectedFolder + "\\gta5.exe"))
{
MessageBox.Show("GTA5.exe not found in folder:\n" + SelectedFolder);
MessageBox.Show("The selected folder could not be used:\n\n" + failReason, "Invalid GTA Folder", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
Result = DialogResult.OK;
Close();
}

2
Utils/GTAFolder.cs
View File

@ -65,7 +65,7 @@ namespace CodeWalker
return true;
} else
{
var tryAgain = MessageBox.Show($"Folder \"{folder}\" is not a valid GTA folder:\n\n{failReason}\n\nDo you want to try choosing a different folder?", "Unable to set GTA Folder", MessageBoxButtons.RetryCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1);
var tryAgain = MessageBox.Show($"Folder \"{folder}\" is not a valid GTA folder:\n\n{failReason}\n\nDo you want to try choosing a different folder?", "Unable to set GTA Folder", MessageBoxButtons.RetryCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
if(tryAgain == DialogResult.Retry)
{
return UpdateGTAFolder(false);