Merge pull request #15 from Glumboi/Experimental

2.2.2.1 Merge
Glumboi · Mar 17, 2023 · 17d2f9a · 17d2f9a
2 parents ea6949e + a4cf821
commit 17d2f9a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml b/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml
@@ -65,7 +65,7 @@
                                x:Name="SaveManager_Button"
                                Click="SaveManager_Button_Click" />
 
-                    <TextBlock Text="Your Shadercount is: | Paste Count: "
+                    <TextBlock Text="Your Shadercount is: | Pastecount: "
                                HorizontalAlignment="Center"
                                FontWeight="Bold"
                                x:Name="ShaderCount_TextBlock" />

diff --git a/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml.cs b/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml.cs
@@ -67,7 +67,7 @@ public string ShaderCount
                 _shaderCount = value;
                 ShaderCount_TextBlock.Text = "Your Shadercount is: " +
                     value +
-                    " | Paste Count: " +
+                    " | Pastecount: " +
                     Networking.GetPasteGameShaderCount(GameName);
             }
         }

diff --git a/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs b/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.2.0")]
-[assembly: AssemblyFileVersion("2.2.2.0")]
+[assembly: AssemblyVersion("2.2.2.1")]
+[assembly: AssemblyFileVersion("2.2.2.1")]
diff --git a/EmuSak-Revive/EmuSak-Revive.Network/Networking.cs b/EmuSak-Revive/EmuSak-Revive.Network/Networking.cs
@@ -109,16 +109,21 @@ private static string GetPasteContent()
 
         private static string GetPasteValue(char splitChar, string gameName, int index)
         {
-            var result = string.Empty;
+            string result = string.Empty;
+            string pasteResult = GetPasteContent();
+            string pasteContent = !string.IsNullOrWhiteSpace(pasteResult) ? pasteResult : string.Empty;
 
-            using (var sr = new StringReader(GetPasteContent()))
+            if (pasteContent != string.Empty)
             {
-                string line;
-                while ((line = sr.ReadLine()) != null)
+                using (var sr = new StringReader(pasteContent))
                 {
-                    if (line.Contains(gameName) && line.Contains(splitChar))
+                    string line;
+                    while ((line = sr.ReadLine()) != null)
                     {
-                        result = line.Split(splitChar)[index];
+                        if (line.Contains(gameName) && line.Contains(splitChar))
+                        {
+                            result = line.Split(splitChar)[index];
+                        }
                     }
                 }
             }