diff options
| author | riperiperi <rhy3756547@hotmail.com> | 2020-05-03 19:42:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 20:42:17 +0200 |
| commit | 28e12dad0fd8bee776a8f3f2add9fdc455cc98c5 (patch) | |
| tree | d1385410196b0f6682001c6f4de8c7960a16ab3c | |
| parent | cf1ea4d155d1cc11bc8105acfb7049d08e28336c (diff) | |
Fix issues causing keyboard profiles to throw errors on load. (#1206)
* Fix issues causing keyboard profiles to throw errors on load.
* Re-add space before the using aliases
| -rw-r--r-- | Ryujinx/Ui/ControllerWindow.cs | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/Ryujinx/Ui/ControllerWindow.cs b/Ryujinx/Ui/ControllerWindow.cs index 06a78ece..47d6db19 100644 --- a/Ryujinx/Ui/ControllerWindow.cs +++ b/Ryujinx/Ui/ControllerWindow.cs @@ -1,17 +1,17 @@ using Gtk; using OpenTK.Input; +using Ryujinx.Common.Configuration.Hid; +using Ryujinx.Common.Utilities; +using Ryujinx.Configuration; +using Ryujinx.HLE.FileSystem; using System; using System.IO; using System.Reflection; +using System.Text.Json; using System.Threading; -using Ryujinx.Configuration; -using Ryujinx.Common.Configuration.Hid; -using Ryujinx.Common.Utilities; -using Ryujinx.HLE.FileSystem; using GUI = Gtk.Builder.ObjectAttribute; using Key = Ryujinx.Configuration.Hid.Key; -using Ryujinx.Common.Logging; namespace Ryujinx.Ui { @@ -821,20 +821,23 @@ namespace Ryujinx.Ui return; } - using (Stream stream = File.OpenRead(path)) + try { - try + using (Stream stream = File.OpenRead(path)) { config = JsonHelper.Deserialize<ControllerConfig>(stream); } - catch (ArgumentException) + } + catch (JsonException) + { + try { - try + using (Stream stream = File.OpenRead(path)) { config = JsonHelper.Deserialize<KeyboardConfig>(stream); } - catch { } } + catch { } } } |