diff --git a/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml b/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml
index 50abd8a..65dc3f1 100644
--- a/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml
+++ b/OpenBullet/Pages/Main/Configs/OtherOptions/ConfigOtherOptionsProxies.xaml
@@ -17,15 +17,16 @@
-
-
-
-
-
+
+
+
+
+
-
+
+
diff --git a/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml b/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml
index 3d928db..fb486de 100644
--- a/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml
+++ b/OpenBullet/Pages/Main/Settings/RL/RLSettingsProxies.xaml
@@ -25,7 +25,6 @@
-
diff --git a/RuriLib/Models/ConfigSettings.cs b/RuriLib/Models/ConfigSettings.cs
index bc6d264..59b8937 100644
--- a/RuriLib/Models/ConfigSettings.cs
+++ b/RuriLib/Models/ConfigSettings.cs
@@ -68,6 +68,10 @@ namespace RuriLib
private int maxProxyUses = 0;
/// The maximum amount of times a proxy can be used before being banned by the Runner (0 for infinite).
public int MaxProxyUses { get { return maxProxyUses; } set { maxProxyUses = value; OnPropertyChanged(); } }
+
+ private bool banProxyAfterGoodStatus = false;
+ /// Whether to ban the proxy after a SUCCESS, CUSTOM or NONE status (not FAIL or RETRY).
+ public bool BanProxyAfterGoodStatus { get { return banProxyAfterGoodStatus; } set { banProxyAfterGoodStatus = value; OnPropertyChanged(); } }
#endregion
#region Data
diff --git a/RuriLib/Runner/RunnerViewModel.cs b/RuriLib/Runner/RunnerViewModel.cs
index 268c52b..c783f66 100644
--- a/RuriLib/Runner/RunnerViewModel.cs
+++ b/RuriLib/Runner/RunnerViewModel.cs
@@ -793,7 +793,7 @@ namespace RuriLib.Runner
case BotStatus.SUCCESS:
validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, "HIT", capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
RaiseDispatchAction(new Action(() => HitsList.Add(validData)));
- if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
+ if (UseProxies && !Settings.Proxies.NeverBan && Config.Settings.BanProxyAfterGoodStatus)
{
currentProxy.Status = Status.BANNED;
currentProxy.LastUsed = DateTime.Now;
@@ -811,7 +811,7 @@ namespace RuriLib.Runner
validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, hitType, capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
RaiseDispatchAction(new Action(() => CustomList.Add(validData)));
- if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
+ if (UseProxies && !Settings.Proxies.NeverBan && Config.Settings.BanProxyAfterGoodStatus)
{
currentProxy.Status = Status.BANNED;
currentProxy.LastUsed = DateTime.Now;
@@ -843,7 +843,7 @@ namespace RuriLib.Runner
validData = new ValidData(botData.Data.Data, botData.Proxy == null ? "" : botData.Proxy.Proxy, botData.Proxy == null ? ProxyType.Http : botData.Proxy.Type, botData.Status, "TOCHK", capturedData.ToCaptureString(), Settings.General.SaveLastSource ? botData.ResponseSource : "", BotLog);
RaiseDispatchAction(new Action(() => ToCheckList.Add(validData)));
- if (UseProxies && !Settings.Proxies.NeverBan && Settings.Proxies.BanAfterGoodStatus)
+ if (UseProxies && !Settings.Proxies.NeverBan && Config.Settings.BanProxyAfterGoodStatus)
{
currentProxy.Status = Status.BANNED;
currentProxy.LastUsed = DateTime.Now;
diff --git a/RuriLib/ViewModels/RLSettings/SettingsProxies.cs b/RuriLib/ViewModels/RLSettings/SettingsProxies.cs
index abe2940..a837603 100644
--- a/RuriLib/ViewModels/RLSettings/SettingsProxies.cs
+++ b/RuriLib/ViewModels/RLSettings/SettingsProxies.cs
@@ -34,10 +34,6 @@ namespace RuriLib.ViewModels
/// Whether to never ban the proxies.
public bool NeverBan { get { return neverBan; } set { neverBan = value; OnPropertyChanged(); } }
- private bool banAfterGoodStatus = false;
- /// Whether to never ban the proxy after a SUCCESS, CUSTOM or NONE status (not FAIL or RETRY).
- public bool BanAfterGoodStatus { get { return banAfterGoodStatus; } set { banAfterGoodStatus = value; OnPropertyChanged(); } }
-
private bool shuffleOnStart = false;
/// Whether proxy lists should be shuffled before being assigned to the Runner.
public bool ShuffleOnStart { get { return shuffleOnStart; } set { shuffleOnStart = value; OnPropertyChanged(); } }