fixed issue caused by rebase

This commit is contained in:
Xpl0itR 2019-08-08 21:18:55 +01:00
parent 97c4ad8850
commit 09313e2fc8
No known key found for this signature in database
GPG key ID: 91798184109676AD
2 changed files with 7 additions and 7 deletions

View file

@ -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;

View file

@ -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>