emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Make sure to reload keys after Migration

Browse source 
This fix keys not being loaded on the first run right after migration.
This commit is contained in:
Thog 2020-01-05 16:39:35 +01:00
parent 63b24b4af2
commit 01daefe38d
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx/Program.cs
View file

@ -50,7 +50,7 @@ namespace Ryujinx
string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx", "system", "prod.keys"); string appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx", "system", "prod.keys");
string userProfilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".switch", "prod.keys"); string userProfilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".switch", "prod.keys");
if (!File.Exists(appDataPath) && !File.Exists(userProfilePath)) if (!File.Exists(appDataPath) && !File.Exists(userProfilePath) && !Migration.IsMigrationNeeded())
{ {
GtkDialog.CreateErrorDialog("Key file was not found. Please refer to `KEYS.md` for more info"); GtkDialog.CreateErrorDialog("Key file was not found. Please refer to `KEYS.md` for more info");
} }

5
Ryujinx/Ui/Migration.cs
View file

@ -64,6 +64,9 @@ namespace Ryujinx.Ui
dialogSuccess.Run(); dialogSuccess.Run();
// Reload key set after migration to be sure to catch the keys in the system directory.
device.System.LoadKeySet();
return true; return true;
} }
catch (HorizonResultException ex) catch (HorizonResultException ex)
@ -171,7 +174,7 @@ namespace Ryujinx.Ui
} }
} }
private static bool IsMigrationNeeded() public static bool IsMigrationNeeded()
{ {
string appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData); string appDataPath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);