diff --git a/OpenBullet/OpenBullet.csproj b/OpenBullet/OpenBullet.csproj index 841b042..6492c8b 100644 --- a/OpenBullet/OpenBullet.csproj +++ b/OpenBullet/OpenBullet.csproj @@ -547,7 +547,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile @@ -559,7 +559,7 @@ App.xaml Code - + Runner.xaml diff --git a/OpenBullet/Pages/Main/Runner/Runner.xaml b/OpenBullet/Pages/Main/Settings/OB/Runner/Runner.xaml similarity index 100% rename from OpenBullet/Pages/Main/Runner/Runner.xaml rename to OpenBullet/Pages/Main/Settings/OB/Runner/Runner.xaml diff --git a/OpenBullet/Pages/Main/Runner/Runner.xaml.cs b/OpenBullet/Pages/Main/Settings/OB/Runner/Runner.xaml.cs similarity index 100% rename from OpenBullet/Pages/Main/Runner/Runner.xaml.cs rename to OpenBullet/Pages/Main/Settings/OB/Runner/Runner.xaml.cs diff --git a/RuriLib/Blocks/BlockRequest.cs b/RuriLib/Blocks/BlockRequest.cs index 5f7f94b..a46abab 100644 --- a/RuriLib/Blocks/BlockRequest.cs +++ b/RuriLib/Blocks/BlockRequest.cs @@ -6,6 +6,7 @@ using System.Collections.ObjectModel; using System.IO; using System.Linq; using System.Text; +using System.Text.RegularExpressions; using System.Windows.Media; namespace RuriLib @@ -401,9 +402,8 @@ namespace RuriLib switch (requestType) { case RequestType.Standard: - var pData = string.Join(Environment.NewLine, postData - .Split(new string[] { "\\n" }, StringSplitOptions.None) - .Select(p => ReplaceValues(p, data))); + var pData = ReplaceValues(Regex.Replace(postData, @"(?