From 0dd8931051ac32b75a1418122f53298bc110a2a5 Mon Sep 17 00:00:00 2001 From: Glumboi <58010838+Glumboi@users.noreply.github.com> Date: Fri, 17 Mar 2023 02:05:17 +0100 Subject: [PATCH 1/3] Fixed crashing if no paste is set up while getting shadercount --- .../EmuSak-Revive.Network/Networking.cs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/EmuSak-Revive/EmuSak-Revive.Network/Networking.cs b/EmuSak-Revive/EmuSak-Revive.Network/Networking.cs index d69c914..1678d74 100644 --- 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]; + } } } } From b4bdc26540a47f5508393ce62e7b38a414cd3959 Mon Sep 17 00:00:00 2001 From: Glumboi <58010838+Glumboi@users.noreply.github.com> Date: Fri, 17 Mar 2023 02:05:31 +0100 Subject: [PATCH 2/3] Update AssemblyInfo.cs --- EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs b/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs index 53456f6..486d12c 100644 --- 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: AssemblyVersion("2.2.2.1")] [assembly: AssemblyFileVersion("2.2.2.0")] From a4cf821f618852b6d5c33a1f64e01edf72a80844 Mon Sep 17 00:00:00 2001 From: Glumboi <58010838+Glumboi@users.noreply.github.com> Date: Fri, 17 Mar 2023 02:06:19 +0100 Subject: [PATCH 3/3] Fixed a spelling issue --- EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml | 2 +- EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml.cs | 2 +- EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml b/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml index 4ef9515..a38cc67 100644 --- 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" /> - diff --git a/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml.cs b/EmuSak-Revive.GUI-WPF/ExtraWindows/GameActionsWindow.xaml.cs index 58c39cd..f8bca84 100644 --- 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 index 486d12c..1573911 100644 --- a/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs +++ b/EmuSak-Revive.GUI-WPF/Properties/AssemblyInfo.cs @@ -52,4 +52,4 @@ // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("2.2.2.1")] -[assembly: AssemblyFileVersion("2.2.2.0")] +[assembly: AssemblyFileVersion("2.2.2.1")]