Removed wait time setting

Sorting settings file
Maxx53 · Nov 30, 2016 · 6b3c999 · 6b3c999
1 parent 42c4b5b
commit 6b3c999
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 119 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ This project uses [Core Audio API](https://github.com/morphx666/CoreAudio).
 
 ###Setting Tips
 
-![Settings Window](http://images.illuzor.com/uploads/rs14ncl2.png)
+![Settings Window](http://images.illuzor.com/uploads/rs14ncl.png)
 
 * If you have Steam-licensed Rocksmith 2014, check the "Steam game" box, otherwise leave this checkbox and browse game EXE-file by pressing "..." button.
 * "Device" сombobox contains all **active** found input audio devices in your system. Select the device connected to your guitar. If your device is not in the list, check the "Manual" box and set VID & PID values manually (find it in "Device manager"). VID & PID sets as "0000" means default non-USB input audio device, for example integrated Realtek microphone input.

diff --git a/scr/NoCableLauncher/PortableSettingsProvider.cs b/scr/NoCableLauncher/PortableSettingsProvider.cs
@@ -4,6 +4,7 @@
 using System.Collections.Specialized;
 using System.Windows.Forms;
 using System.IO;
+using System.Linq;
 
 namespace NoCableLauncher
 {
@@ -70,7 +71,9 @@ public override void Initialize(string name, NameValueCollection config)
 
         public override void SetPropertyValues(SettingsContext context, SettingsPropertyValueCollection collection)
         {
-            foreach (SettingsPropertyValue propertyValue in collection)
+           var sorted =  collection.Cast<SettingsPropertyValue>().OrderBy(s => s.Name);
+
+            foreach (SettingsPropertyValue propertyValue in sorted)
                 SetValue(propertyValue);
 
             try

diff --git a/scr/NoCableLauncher/Program.cs b/scr/NoCableLauncher/Program.cs
@@ -136,26 +136,40 @@ private static void StartGame()
             }
             else
                 //This do not return game process!
+                //Steam starts game with some delay
                 Process.Start(steamName);
         }
 
+
         private static void HookProcess()
         {
-            //Finding game process
-            Process[] processes = Process.GetProcessesByName(exeName);
+            //Waiting 60 seconds, while game starts
+            for (int i = 0; i < 60; i++)
+            {
+                Thread.Sleep(1000);
+
+                //Finding game process
+                Process[] processes = Process.GetProcessesByName(exeName);
 
-            if (processes.Length == 0)
-                ExitWithError(string.Format("Can't find process: {0}.exe", exeName));
+                if (processes.Length > 0)
+                {
+                    //If game process found
 
-            var process = processes[0];
-            processID = process.Id;
+                    var process = processes[0];
+                    processID = process.Id;
 
-            if (settings.Multiplayer)
-            {
-                process.EnableRaisingEvents = true;
-                process.Exited += process_Exited;
-                gameRunning = true;
+                    if (settings.Multiplayer)
+                    {
+                        process.EnableRaisingEvents = true;
+                        process.Exited += process_Exited;
+                        gameRunning = true;
+                    }
+
+                    return;
+                }
             }
+
+            ExitWithError(string.Format("Can't find process: {0}.exe", exeName));
         }
 
         private static void process_Exited(object sender, EventArgs e)
@@ -226,9 +240,6 @@ public static void Main(string[] args)
                 //Launching Rocksmith 2014
                 StartGame();
 
-                //Waiting while game starting
-                Thread.Sleep(settings.waitTime);
-
                 //Getting process id and setting exit event
                 HookProcess();