From 465024ef7fcb8e8599d15ecdfa90698223a1312f Mon Sep 17 00:00:00 2001 From: Sk1ffy Date: Thu, 11 Jul 2024 12:55:33 +0100 Subject: [PATCH] Launcher Bug Fix --- RLOrbital/Form1.cs | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/RLOrbital/Form1.cs b/RLOrbital/Form1.cs index b097726..de87f18 100644 --- a/RLOrbital/Form1.cs +++ b/RLOrbital/Form1.cs @@ -656,12 +656,12 @@ private bool ImportGame() if (outputSTD.Contains("Game is already installed")) { - MessageBox.Show("Game is ready. Launcher is ready."); + MessageBox.Show("Game is ready to launch."); return true; } else if (outputSTD.Contains("has been imported")) { - MessageBox.Show("Sucesfully Imported. Launcher is ready."); + MessageBox.Show("Sucesfully Imported. Game is ready to launch."); return true; } else if (outputSTD.Contains("please verify that the path is correct")) @@ -669,11 +669,37 @@ private bool ImportGame() MessageBox.Show(@"Invalid directory selected. Make sure the directory ends with \rocketleague and or is the correct directory."); return false; } + else if (outputSTD.Contains("No saved credentials")) + { + MessageBox.Show("Please sign into an account before selecting the rocket league directory."); + return false; + + } + else if (outputSTD.Contains("Did not find game")) + { + MessageBox.Show("Game not installed on Epic account. Please download and install it."); + return false; + } return true; + } + private void DeleteDirectory() + { + if (System.IO.File.Exists("rl.txt")) + { + System.IO.File.Delete("rl.txt"); + textBox3.Text = ""; + } + } private void button8_Click(object sender, EventArgs e) { + + if (listBox_Usernames.Items.Count == 0) //We cant import a game into legendary without being signed into an active Epic games account. + { + MessageBox.Show("Please sign into an account before trying to select a directory."); + return; + } if (System.IO.File.Exists("rl.txt") && new FileInfo("rl.txt").Length != 0) { DialogResult response = MessageBox.Show("Would you like to use previously found Rocket League Directory", @@ -682,7 +708,10 @@ private void button8_Click(object sender, EventArgs e) { string directory = System.IO.File.ReadAllText("rl.txt"); textBox3.Text = directory; - ImportGame(); + if(ImportGame() == false) + { + DeleteDirectory(); + } return; } } @@ -710,7 +739,10 @@ private void button8_Click(object sender, EventArgs e) { System.IO.File.WriteAllText("rl.txt", folderPath); } - ImportGame(); + if (ImportGame() == false) + { + DeleteDirectory(); + } } private void UpdateAccounts()