v1.0.4

ItsBrank · ItsBrank · commit 60ceb87bfafd · 2022-12-23T00:35:02.000-05:00
diff --git a/Controls/CRNewsPanel.cs b/Controls/CRNewsPanel.cs
@@ -335,7 +335,10 @@ private void NextBtn_DoubleClick(object sender, EventArgs e)
 
         private void ThumbnailImg_Click(object sender, EventArgs e)
         {
-            Process.Start(new ProcessStartInfo(NewsArticles[CurrentIndex].NewsUrl) { UseShellExecute = true });
+            if (!String.IsNullOrEmpty(NewsArticles[CurrentIndex].NewsUrl))
+            {
+                Process.Start(new ProcessStartInfo(NewsArticles[CurrentIndex].NewsUrl) { UseShellExecute = true });
+            }
         }
 
         private void PreviousBtn_MouseEnter(object sender, EventArgs e)
diff --git a/Forms/MainFrm.cs b/Forms/MainFrm.cs
@@ -163,7 +163,7 @@ private void ManualInjectBtn_Click(object sender, EventArgs e)
 
                 if (processes.Count > 0)
                 {
-                    LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()), true);
+                    LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()));
                 }
             }
             else
@@ -174,33 +174,12 @@ private void ManualInjectBtn_Click(object sender, EventArgs e)
                 {
                     foreach (InjectionResults result in results)
                     {
-                        LogInjectionResult(result, true);
+                        LogInjectionResult(result);
                     }
                 }
             }
         }
 
-        // combobox for player id
-        // combobox for playlist
-        // slider for timeframe (or combo)
-
-        /*
-
-        Data Graph:
-        - Score [Red]
-        - Goals [Orange]
-        - Assists [Yellow]
-        - Saves [Green]
-        - Shots [Blue]
-        - Damage [Purple] (Dropshot only)
-
-        MMR Graph:
-        - Start Line in Center
-
-        Bar Graph:
-        - Goal to shot ratio
-        */
-
         private void ReloadSessionsBtn_OnButtonClick(object sender, EventArgs e)
         {
             Sessions.ParseSessions();
@@ -434,24 +413,31 @@ private void ProcessTmr_Tick(object sender, EventArgs e)
                 {
                     LaunchBtn.DisplayText = "Launch (Already Running)";
 
-                    if (!Updator.IsOutdated())
+                    if (ProcessCtrl.Status != CRProcessPanel.StatusTypes.TYPE_INJECTING)
                     {
-                        ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_RUNNING;
-                    }
-                    else
-                    {
-                        ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;
-                    }
+                        if (!Updator.IsOutdated())
+                        {
+                            ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_RUNNING;
+                            ProcessCtrl.Result = InjectionResults.RESULT_NONE;
+                        }
+                        else
+                        {
+                            ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;
+                            ProcessCtrl.Result = InjectionResults.RESULT_NONE;
+                        }
 
-                    if (Updator.IsOutdated() && Configuration.ShouldPreventInjection())
-                    {
-                        ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;
-                        InjectTmr.Stop();
-                    }
-                    else
-                    {
-                        ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_INJECTING;
-                        InjectTmr.Start();
+                        if (Updator.IsOutdated() && Configuration.ShouldPreventInjection())
+                        {
+                            ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;
+                            ProcessCtrl.Result = InjectionResults.RESULT_NONE;
+                            InjectTmr.Stop();
+                        }
+                        else
+                        {
+                            ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_INJECTING;
+                            ProcessCtrl.Result = InjectionResults.RESULT_NONE;
+                            InjectTmr.Start();
+                        }
                     }
                 }
                 else
@@ -460,13 +446,15 @@ private void ProcessTmr_Tick(object sender, EventArgs e)
                     LaunchBtn.DisplayText = "Launch Rocket League";
                     ManualInjectBtn.Visible = false;
                     ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_NOT_RUNNING;
+                    ProcessCtrl.Result = InjectionResults.RESULT_NONE;
                 }
             }
             else
             {
                 ProcessTmr.Stop();
                 ManualInjectBtn.Visible = false;
                 ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_DISABLED;
+                ProcessCtrl.Result = InjectionResults.RESULT_NONE;
             }
         }
 
@@ -502,12 +490,10 @@ private void InjectTmr_Tick(object sender, EventArgs e)
 
                 if (processes.Count > 0)
                 {
-                    LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()), true);
-                }
-                else
-                {
-                    InjectTmr.Stop();
+                    LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()));
                 }
+
+                InjectTmr.Stop();
             }
             else
             {
@@ -517,13 +503,11 @@ private void InjectTmr_Tick(object sender, EventArgs e)
                 {
                     foreach (InjectionResults result in results)
                     {
-                        LogInjectionResult(result, true);
+                        LogInjectionResult(result);
                     }
                 }
-                else
-                {
-                    InjectTmr.Stop();
-                }
+
+                InjectTmr.Stop();
             }
         }
 
@@ -540,12 +524,9 @@ private void UpdateTmr_Tick(object sender, EventArgs e)
             }
         }
 
-        void LogInjectionResult(InjectionResults result, bool bUpdateStatus)
+        void LogInjectionResult(InjectionResults result)
         {
-            if (bUpdateStatus)
-            {
-                ProcessCtrl.Result = result;
-            }
+            ProcessCtrl.Result = result;
 
             switch (result)
             {
diff --git a/Framework/Assembly.cs b/Framework/Assembly.cs
@@ -11,7 +11,7 @@ public static class Assembly
         private static readonly string Product = "CodeRedLauncher";
         private static readonly string Copyright = "Copyright © CodeRedModding 2022";
         private static readonly string License = "MIT License";
-        private static readonly string Version = "1.0.3";
+        private static readonly string Version = "1.0.4";
 
         public static string GetTitle() { return Title; }
         public static string GetDescription() { return Description; }
diff --git a/Framework/Manager.cs b/Framework/Manager.cs
@@ -364,10 +364,8 @@ public static InjectionResults TryLoadIndividual(Process process, Architecture.P
                     return InjectionResults.RESULT_PROCESS_NOT_FOUND;
                 }
             }
-            else
-            {
-                return InjectionResults.RESULT_LIBRARY_NOT_FOUND;
-            }
+
+            return InjectionResults.RESULT_LIBRARY_NOT_FOUND;
         }
 
         private static InjectionResults LoadLibraryInternal(Process process, Architecture.Path libraryFile)

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,10 @@ private void NextBtn_DoubleClick(object sender, EventArgs e)`
`335`	`335`
`336`	`336`	`private void ThumbnailImg_Click(object sender, EventArgs e)`
`337`	`337`	`{`
`338`		`- Process.Start(new ProcessStartInfo(NewsArticles[CurrentIndex].NewsUrl) { UseShellExecute = true });`
	`338`	`+ if (!String.IsNullOrEmpty(NewsArticles[CurrentIndex].NewsUrl))`
	`339`	`+ {`
	`340`	`+ Process.Start(new ProcessStartInfo(NewsArticles[CurrentIndex].NewsUrl) { UseShellExecute = true });`
	`341`	`+ }`
`339`	`342`	`}`
`340`	`343`
`341`	`344`	`private void PreviousBtn_MouseEnter(object sender, EventArgs e)`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ private void ManualInjectBtn_Click(object sender, EventArgs e)`
`163`	`163`
`164`	`164`	`if (processes.Count > 0)`
`165`	`165`	`{`
`166`		`- LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()), true);`
	`166`	`+ LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()));`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`else`
`@@ -174,33 +174,12 @@ private void ManualInjectBtn_Click(object sender, EventArgs e)`
`174`	`174`	`{`
`175`	`175`	`foreach (InjectionResults result in results)`
`176`	`176`	`{`
`177`		`- LogInjectionResult(result, true);`
	`177`	`+ LogInjectionResult(result);`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`183`		`- // combobox for player id`
`184`		`- // combobox for playlist`
`185`		`- // slider for timeframe (or combo)`
`186`		`-`
`187`		`- /*`
`188`		`-`
`189`		`- Data Graph:`
`190`		`- - Score [Red]`
`191`		`- - Goals [Orange]`
`192`		`- - Assists [Yellow]`
`193`		`- - Saves [Green]`
`194`		`- - Shots [Blue]`
`195`		`- - Damage [Purple] (Dropshot only)`
`196`		`-`
`197`		`- MMR Graph:`
`198`		`- - Start Line in Center`
`199`		`-`
`200`		`- Bar Graph:`
`201`		`- - Goal to shot ratio`
`202`		`- */`
`203`		`-`
`204`	`183`	`private void ReloadSessionsBtn_OnButtonClick(object sender, EventArgs e)`
`205`	`184`	`{`
`206`	`185`	`Sessions.ParseSessions();`
`@@ -434,24 +413,31 @@ private void ProcessTmr_Tick(object sender, EventArgs e)`
`434`	`413`	`{`
`435`	`414`	`LaunchBtn.DisplayText = "Launch (Already Running)";`
`436`	`415`
`437`		`- if (!Updator.IsOutdated())`
	`416`	`+ if (ProcessCtrl.Status != CRProcessPanel.StatusTypes.TYPE_INJECTING)`
`438`	`417`	`{`
`439`		`- ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_RUNNING;`
`440`		`- }`
`441`		`- else`
`442`		`- {`
`443`		`- ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;`
`444`		`- }`
	`418`	`+ if (!Updator.IsOutdated())`
	`419`	`+ {`
	`420`	`+ ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_RUNNING;`
	`421`	`+ ProcessCtrl.Result = InjectionResults.RESULT_NONE;`
	`422`	`+ }`
	`423`	`+ else`
	`424`	`+ {`
	`425`	`+ ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;`
	`426`	`+ ProcessCtrl.Result = InjectionResults.RESULT_NONE;`
	`427`	`+ }`
`445`	`428`
`446`		`- if (Updator.IsOutdated() && Configuration.ShouldPreventInjection())`
`447`		`- {`
`448`		`- ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;`
`449`		`- InjectTmr.Stop();`
`450`		`- }`
`451`		`- else`
`452`		`- {`
`453`		`- ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_INJECTING;`
`454`		`- InjectTmr.Start();`
	`429`	`+ if (Updator.IsOutdated() && Configuration.ShouldPreventInjection())`
	`430`	`+ {`
	`431`	`+ ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_OUTDATED;`
	`432`	`+ ProcessCtrl.Result = InjectionResults.RESULT_NONE;`
	`433`	`+ InjectTmr.Stop();`
	`434`	`+ }`
	`435`	`+ else`
	`436`	`+ {`
	`437`	`+ ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_INJECTING;`
	`438`	`+ ProcessCtrl.Result = InjectionResults.RESULT_NONE;`
	`439`	`+ InjectTmr.Start();`
	`440`	`+ }`
`455`	`441`	`}`
`456`	`442`	`}`
`457`	`443`	`else`
`@@ -460,13 +446,15 @@ private void ProcessTmr_Tick(object sender, EventArgs e)`
`460`	`446`	`LaunchBtn.DisplayText = "Launch Rocket League";`
`461`	`447`	`ManualInjectBtn.Visible = false;`
`462`	`448`	`ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_NOT_RUNNING;`
	`449`	`+ ProcessCtrl.Result = InjectionResults.RESULT_NONE;`
`463`	`450`	`}`
`464`	`451`	`}`
`465`	`452`	`else`
`466`	`453`	`{`
`467`	`454`	`ProcessTmr.Stop();`
`468`	`455`	`ManualInjectBtn.Visible = false;`
`469`	`456`	`ProcessCtrl.Status = CRProcessPanel.StatusTypes.TYPE_DISABLED;`
	`457`	`+ ProcessCtrl.Result = InjectionResults.RESULT_NONE;`
`470`	`458`	`}`
`471`	`459`	`}`
`472`	`460`
`@@ -502,12 +490,10 @@ private void InjectTmr_Tick(object sender, EventArgs e)`
`502`	`490`
`503`	`491`	`if (processes.Count > 0)`
`504`	`492`	`{`
`505`		`- LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()), true);`
`506`		`- }`
`507`		`- else`
`508`		`- {`
`509`		`- InjectTmr.Stop();`
	`493`	`+ LogInjectionResult(LibraryManager.TryLoadIndividual(processes[0], Storage.GetLibraryFile()));`
`510`	`494`	`}`
	`495`	`+`
	`496`	`+ InjectTmr.Stop();`
`511`	`497`	`}`
`512`	`498`	`else`
`513`	`499`	`{`
`@@ -517,13 +503,11 @@ private void InjectTmr_Tick(object sender, EventArgs e)`
`517`	`503`	`{`
`518`	`504`	`foreach (InjectionResults result in results)`
`519`	`505`	`{`
`520`		`- LogInjectionResult(result, true);`
	`506`	`+ LogInjectionResult(result);`
`521`	`507`	`}`
`522`	`508`	`}`
`523`		`- else`
`524`		`- {`
`525`		`- InjectTmr.Stop();`
`526`		`- }`
	`509`	`+`
	`510`	`+ InjectTmr.Stop();`
`527`	`511`	`}`
`528`	`512`	`}`
`529`	`513`
`@@ -540,12 +524,9 @@ private void UpdateTmr_Tick(object sender, EventArgs e)`
`540`	`524`	`}`
`541`	`525`	`}`
`542`	`526`
`543`		`- void LogInjectionResult(InjectionResults result, bool bUpdateStatus)`
	`527`	`+ void LogInjectionResult(InjectionResults result)`
`544`	`528`	`{`
`545`		`- if (bUpdateStatus)`
`546`		`- {`
`547`		`- ProcessCtrl.Result = result;`
`548`		`- }`
	`529`	`+ ProcessCtrl.Result = result;`
`549`	`530`
`550`	`531`	`switch (result)`
`551`	`532`	`{`
Original file line number	Diff line number	Diff line change
`@@ -364,10 +364,8 @@ public static InjectionResults TryLoadIndividual(Process process, Architecture.P`
`364`	`364`	`return InjectionResults.RESULT_PROCESS_NOT_FOUND;`
`365`	`365`	`}`
`366`	`366`	`}`
`367`		`- else`
`368`		`- {`
`369`		`- return InjectionResults.RESULT_LIBRARY_NOT_FOUND;`
`370`		`- }`
	`367`	`+`
	`368`	`+ return InjectionResults.RESULT_LIBRARY_NOT_FOUND;`
`371`	`369`	`}`
`372`	`370`
`373`	`371`	`private static InjectionResults LoadLibraryInternal(Process process, Architecture.Path libraryFile)`