From 09313e2fc864a9ba2d7046fbf82fa563fa309285 Mon Sep 17 00:00:00 2001
From: Xpl0itR <xpl0itr@outlook.com>
Date: Thu, 8 Aug 2019 21:18:55 +0100
Subject: [PATCH] fixed issue caused by rebase

---
 Ryujinx/Ui/SwitchSettings.cs    | 8 ++++----
 Ryujinx/Ui/SwitchSettings.glade | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Ryujinx/Ui/SwitchSettings.cs b/Ryujinx/Ui/SwitchSettings.cs
index 551f93dd7f..2fc08aeafd 100644
--- a/Ryujinx/Ui/SwitchSettings.cs
+++ b/Ryujinx/Ui/SwitchSettings.cs
@@ -37,7 +37,7 @@ namespace Ryujinx.UI
         [GUI] CheckButton  _vSyncToggle;
         [GUI] CheckButton  _multiSchedToggle;
         [GUI] CheckButton  _fsicToggle;
-        [GUI] CheckButton  _aggrToggle;
+        [GUI] CheckButton  _legacyJitToggle;
         [GUI] CheckButton  _ignoreToggle;
         [GUI] CheckButton  _directKeyboardAccess;
         [GUI] ComboBoxText _systemLanguageSelect;
@@ -134,7 +134,7 @@ namespace Ryujinx.UI
             if (SwitchConfig.EnableVsync)               { _vSyncToggle.Click();          }
             if (SwitchConfig.EnableMulticoreScheduling) { _multiSchedToggle.Click();     }
             if (SwitchConfig.EnableFsIntegrityChecks)   { _fsicToggle.Click();           }
-            if (SwitchConfig.EnableAggressiveCpuOpts)   { _aggrToggle.Click();           }
+            if (SwitchConfig.EnableLegacyJit)           { _legacyJitToggle.Click();      }
             if (SwitchConfig.IgnoreMissingServices)     { _ignoreToggle.Click();         }
             if (SwitchConfig.EnableKeyboard)            { _directKeyboardAccess.Click(); }
             if (SwitchConfig.EnableCustomTheme)         { _custThemeToggle.Click();      }
@@ -306,7 +306,7 @@ namespace Ryujinx.UI
             if (_vSyncToggle.Active)           SwitchConfig.EnableVsync               = true;
             if (_multiSchedToggle.Active)      SwitchConfig.EnableMulticoreScheduling = true;
             if (_fsicToggle.Active)            SwitchConfig.EnableFsIntegrityChecks   = true;
-            if (_aggrToggle.Active)            SwitchConfig.EnableAggressiveCpuOpts   = true;
+            if (_legacyJitToggle.Active)       SwitchConfig.EnableLegacyJit           = true;
             if (_ignoreToggle.Active)          SwitchConfig.IgnoreMissingServices     = true;
             if (_directKeyboardAccess.Active)  SwitchConfig.EnableKeyboard            = true;
             if (_custThemeToggle.Active)       SwitchConfig.EnableCustomTheme         = true;
@@ -324,7 +324,7 @@ namespace Ryujinx.UI
             if (!_vSyncToggle.Active)          SwitchConfig.EnableVsync               = false;
             if (!_multiSchedToggle.Active)     SwitchConfig.EnableMulticoreScheduling = false;
             if (!_fsicToggle.Active)           SwitchConfig.EnableFsIntegrityChecks   = false;
-            if (!_aggrToggle.Active)           SwitchConfig.EnableAggressiveCpuOpts   = false;
+            if (!_legacyJitToggle.Active)      SwitchConfig.EnableLegacyJit           = false;
             if (!_ignoreToggle.Active)         SwitchConfig.IgnoreMissingServices     = false;
             if (!_directKeyboardAccess.Active) SwitchConfig.EnableKeyboard            = false;
             if (!_custThemeToggle.Active)      SwitchConfig.EnableCustomTheme         = false;
diff --git a/Ryujinx/Ui/SwitchSettings.glade b/Ryujinx/Ui/SwitchSettings.glade
index 4593a93453..6ed8317d08 100644
--- a/Ryujinx/Ui/SwitchSettings.glade
+++ b/Ryujinx/Ui/SwitchSettings.glade
@@ -1471,12 +1471,12 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" id="_aggrToggle">
-                                    <property name="label" translatable="yes">Enable Aggressive CPU Optimizations</property>
+                                  <object class="GtkCheckButton" id="_legacyJitToggle">
+                                    <property name="label" translatable="yes">Use old ChocolArm64 ARM emulator</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Enable or Disable aggressive CPU optimizations</property>
+                                    <property name="tooltip_text" translatable="yes">Uses old ChocolArm64 ARM emulator rather then the new ARMeilleure</property>
                                     <property name="halign">start</property>
                                     <property name="margin_top">5</property>
                                     <property name="margin_bottom">5</property>