Added a few comments

Reordered some stuff
Remade the select last selected one
Added an error if nothing selected

Author: Tudi20

Universal THCRAP Launcher/Form1.Designer.cs

@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 using Universal_THCRAP_Launcher.Properties;
@@ -35,89 +36,86 @@ void ErrorAndExit(string errorMessage)
 
         private void Form1_Load(object sender, EventArgs e)
         {
-
+            //Give error if not next to thcrap_loader.exe
             const string msgError1 =
                 "thcrap_loader.exe couldn't be found.\nMake sure you put the application next to it!";
             bool fileExists = !File.Exists("thcrap_loader.exe");
             if (fileExists)
                 ErrorAndExit(msgError1);
 
+            //Give error if no games.js file
             const string msgError2 =
                 "games.js couldn't be found.\nMake sure you run thcrap_configure.exe first!";
             if (!File.Exists("games.js")) ErrorAndExit(msgError2);
 
-            _jsFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.js").ToList();
-
-            for (int i = 0; i < _jsFiles.Count; i++)
-                _jsFiles[i] = _jsFiles[i].Replace(Directory.GetCurrentDirectory() + "\\", "");
+            #region Load data from files
 
-            _jsFiles.Remove("games.js");
-            _jsFiles.Remove("config.js");
-            _jsFiles.Remove("favourites.js");
+            //Load patch stacks
+            _jsFiles = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.js").ToList();
 
+            //Give error if there are no .js files apart from games.js and config.js
             const string msgError3 =
                 "No config files could be found.\nMake sure you run thcrap_configure.exe first!";
             if (_jsFiles.Count == 0) ErrorAndExit(msgError3);
 
-            foreach (var item in _jsFiles)
-                listBox1.Items.Add(item);
-
-            FileStream fs = new FileStream("games.js", FileMode.Open);
-            StreamReader sr = new StreamReader(fs);
-            string file = sr.ReadToEnd();
-            sr.Close();
-            fs.Close();
-
+            //Load executables
+            string file = File.ReadAllText("games.js");
             Dictionary<string, string> games = JsonConvert.DeserializeObject<Dictionary<string, string>>(file);
 
-
-            foreach (var item in games)
-            {
-                _gamesList.Add(item.Key);
-                listBox2.Items.Add(item.Key);
-            }
-
-            listBox1.SelectedIndex = 0;
-            listBox2.SelectedIndex = 0;
-
-            //MessageBox.Show((string)listBox1.SelectedItem);
-
-            Configuration1.UthcraplLastConfig = (string) listBox1.SelectedItem;
-            Configuration1.UthcraplLastGame = (string) listBox2.SelectedItem;
-
-            //MessageBox.Show(Configuration1.UthcraplLastConfig);
-
+            //Load config
             if (File.Exists("config.js"))
             {
                 file = File.ReadAllText("config.js");
                 Configuration1 = JsonConvert.DeserializeObject<Configuration>(file);
-                checkBox1.Checked = Configuration1.UthcraplExitAfterStartup;
-                if (Configuration1.UthcraplLastConfig != null || Configuration1.UthcraplLastGame != null)
-                {
-                    listBox1.SelectedIndex = listBox1.FindString(Configuration1.UthcraplLastConfig);
-                    listBox2.SelectedIndex = listBox2.FindString(Configuration1.UthcraplLastGame);
-                }
             }
 
+            //Load favourites
             if (File.Exists("favourites.js"))
             {
                 file = File.ReadAllText("favourites.js");
                 Favourites1 = JsonConvert.DeserializeObject<Favourites>(file);
-                foreach (var VARIABLE in Favourites1.Patches)
-                {
-                    int index = listBox1.FindStringExact(VARIABLE);
-                    listBox1.Items[index] += " ★";
-                }
+            }
 
-                foreach (var VARIABLE in Favourites1.Games)
-                {
-                    int index = listBox2.FindStringExact(VARIABLE);
-                    listBox2.Items[index] += " ★";
-                }
+            #endregion
+            #region  Fix patch stack list
+            for (int i = 0; i < _jsFiles.Count; i++)
+                _jsFiles[i] = _jsFiles[i].Replace(Directory.GetCurrentDirectory() + "\\", "");
+            _jsFiles.Remove("games.js");
+            _jsFiles.Remove("config.js");
+            _jsFiles.Remove("favourites.js");
+            #endregion
+
+            #region Display
+            //Display patch stacks
+            foreach (var item in _jsFiles)
+                listBox1.Items.Add(item);
+            //Display executables
+            foreach (var item in games)
+            {
+                _gamesList.Add(item.Key);
+                listBox2.Items.Add(item.Key);
             }
+            
+            //Display config
+            checkBox1.Checked = Configuration1.UthcraplExitAfterStartup;
 
-            UpdateConfigFile();
+            
+
+            //Update Display favourites
+            foreach (var VARIABLE in Favourites1.Patches)
+            {
+                int index = listBox1.FindStringExact(VARIABLE);
+                listBox1.Items[index] += " ★";
+            }
+            foreach (var VARIABLE in Favourites1.Games)
+            {
+                int index = listBox2.FindStringExact(VARIABLE);
+                listBox2.Items[index] += " ★";
+            }
+            #endregion
+            #region Set stuff
 
+            //Create const for resizing
             _resizeConsts = new int[8];
             _resizeConsts[0] = Size.Width - button1.Width;
             _resizeConsts[1] = Size.Width - splitContainer1.Width;
@@ -128,9 +126,11 @@ private void Form1_Load(object sender, EventArgs e)
             _resizeConsts[6] = sort_az_button2.Location.X - listBox1.Size.Width;
             _resizeConsts[7] = star_button2.Location.X - sort_az_button2.Location.X;
 
+            #endregion
+
+            //Default sort
             SortListBoxItems(ref listBox1);
             SortListBoxItems(ref listBox2);
-
             Debug.WriteLine("Form1 Loaded");
         }
 
@@ -152,12 +152,21 @@ private void SortListBoxItemsDesc(ref ListBox lb)
             lb.Items.AddRange(items.OrderByDescending(i => i).ToArray());
         }
 
-        private void UpdateConfigFile()
+        /// <summary>
+        /// Updates the configuration and favourites list
+        /// </summary>
+        private void UpdateConfig()
         {
-            Configuration1.UthcraplLastConfig = (string) listBox1.SelectedItem;
-            Configuration1.UthcraplLastGame = (string) listBox2.SelectedItem;
-            string output = JsonConvert.SerializeObject(Configuration1, Formatting.Indented);
-            File.WriteAllText("config.js", output);
+            if (listBox1.SelectedIndex == -1 && listBox1.Items.Count > 0)
+                listBox1.SelectedIndex = 0;
+            if (listBox1.SelectedIndex != -1)
+            Configuration1.UthcraplLastConfig = ((string)listBox1.SelectedItem).Replace(" ★","");
+            if (listBox2.SelectedIndex == -1 && listBox2.Items.Count > 0)
+                listBox2.SelectedIndex = 0;
+            if (listBox2.SelectedIndex != -1)
+            Configuration1.UthcraplLastGame = ((string)listBox2.SelectedItem).Replace(" ★", "");
+            
+            
 
             Favourites1.Patches.Clear();
             Favourites1.Games.Clear();
@@ -175,15 +184,56 @@ private void UpdateConfigFile()
                     string v = s.Replace(" ★", "");
                     Favourites1.Games.Add(v);
                 }
+        }
+
+        /// <summary>
+        /// Selects the items based on the configuration
+        /// </summary>
+        private void ReadConfig()
+        {
+            string s = Configuration1.UthcraplLastConfig;
+            if (Favourites1.Patches.Contains(s))
+                s += " ★";
+            listBox1.SelectedIndex = listBox1.FindStringExact(s);
+            s = Configuration1.UthcraplLastGame;
+
+            if (Favourites1.Games.Contains(s))
+                s += " ★";
+
+            listBox2.SelectedIndex = listBox2.FindStringExact(s);
+
+            if (listBox1.SelectedIndex == -1)
+                listBox1.SelectedIndex = 0;
+            if (listBox2.SelectedIndex == -1)
+                listBox2.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// Writes the configuration and favourites to file
+        /// </summary>
+        private void UpdateConfigFile()
+        {
+            UpdateConfig();
+            string output = JsonConvert.SerializeObject(Configuration1, Formatting.Indented);
+            File.WriteAllText("config.js", output);
 
             output = JsonConvert.SerializeObject(Favourites1,Formatting.Indented);
             File.WriteAllText("favourites.js", output);
 
             Debug.WriteLine("Config file Updated!");
         }
 
+        /// <summary>
+        /// Starts thcrap with the selected patch stack and executable
+        /// </summary>
         private void StartThcrap()
         {
+            if (listBox1.SelectedIndex == -1 || listBox2.SelectedIndex == -1)
+            {
+                const string error = "No run configuration (patch stack) or game (executable) selected!\nPlease select one!";
+                MessageBox.Show(error, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             string s = "";
             s += listBox1.SelectedItem;
             s += " ";
@@ -199,6 +249,9 @@ private void StartThcrap()
 
         private void button1_Click(object sender, EventArgs e) => StartThcrap();
 
+        /// <summary>
+        /// Handles starting thcrap with enter and favouriting when pressing f
+        /// </summary>
         private new void KeyPress(object sender, KeyPressEventArgs e)
         {
             if (e.KeyChar == (char) Keys.Enter)
@@ -259,7 +312,7 @@ private void sort_az_button1_Click(object sender, EventArgs e)
                 SortListBoxItemsDesc(ref listBox1);
                 sort_az_button1.BackgroundImage = _sortAscending;
             }
-            Refresh();
+            ReadConfig();
         }
 
         private void sort_az_button2_Click(object sender, EventArgs e)
@@ -274,7 +327,7 @@ private void sort_az_button2_Click(object sender, EventArgs e)
                 SortListBoxItemsDesc(ref listBox2);
                 sort_az_button2.BackgroundImage = _sortAscending;
             }
-            Refresh();
+            ReadConfig();
         }
 
         private readonly Image _star = new Bitmap(Resources.Star);
@@ -304,7 +357,9 @@ private void star_button1_Click(object sender, EventArgs e)
                 {
                     int index = listBox1.FindStringExact(VARIABLE);
                     listBox1.Items[index] += " ★";
+                    
                 }
+                ReadConfig();
             }
         }
 
@@ -333,6 +388,36 @@ private void star_button2_Click(object sender, EventArgs e)
                     int index = listBox2.FindStringExact(VARIABLE);
                     listBox2.Items[index] += " ★";
                 }
+                ReadConfig();
+            }
+        }
+
+        private void Form1_Shown(object sender, EventArgs e)
+        {
+            ReadConfig();
+            //Set default selection index
+            if (listBox1.SelectedIndex == -1)
+                listBox1.SelectedIndex = 0;
+
+            if (listBox2.SelectedIndex == -1)
+                listBox2.SelectedIndex = 0;
+
+            UpdateConfigFile();
+        }
+
+        private void SelectedIndexChanged(object sender, EventArgs e)
+        {
+            ListBox lb = (ListBox) sender;
+            switch (lb.Name)
+            {
+                case "listBox1":
+                    if (lb.SelectedIndex != -1)
+                    Configuration1.UthcraplLastConfig = lb.SelectedItem.ToString().Replace(" ★","");
+                    break;
+                case "listBox2":
+                    if (lb.SelectedIndex != -1)
+                    Configuration1.UthcraplLastGame = lb.SelectedItem.ToString().Replace(" ★", "");
+                    break;
             }
         }
     }