mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a Windows specific build condition and a Linux bug fix

Browse source
This commit is contained in:
Xpl0itR 2019-09-18 18:22:08 +01:00 • committed by unknown
commit e86f7ee784
No known key found for this signature in database
GPG key ID: 91798184109676AD
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx/Ryujinx.csproj
View file

@ -66,7 +66,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DiscordRichPresence" Version="1.0.121" /> <PackageReference Include="DiscordRichPresence" Version="1.0.121" />
<PackageReference Include="GtkSharp" Version="3.22.25.24" /> <PackageReference Include="GtkSharp" Version="3.22.25.24" />
<PackageReference Include="GtkSharp.Dependencies" Version="1.0.1" /> <PackageReference Include="GtkSharp.Dependencies" Version="1.0.1" Condition="'$(RuntimeIdentifier)' != 'linux-x64' AND '$(RuntimeIdentifier)' != 'osx-x64'" />
<PackageReference Include="JsonPrettyPrinter" Version="1.0.1.1" /> <PackageReference Include="JsonPrettyPrinter" Version="1.0.1.1" />
<PackageReference Include="OpenTK.NetStandard" Version="1.0.4" /> <PackageReference Include="OpenTK.NetStandard" Version="1.0.4" />
</ItemGroup> </ItemGroup>

2
Ryujinx/Ui/ApplicationLibrary.cs
View file

@ -393,7 +393,7 @@ namespace Ryujinx.UI
try try
{ {
string[] userData = new string[3]; string[] userData = new string[3];
string savePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFS", "GUI", UserId, TitleId); string savePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFs", "GUI", UserId, TitleId);
//Time Played //Time Played
if (File.Exists(Path.Combine(savePath, "TimePlayed.dat")) == false) if (File.Exists(Path.Combine(savePath, "TimePlayed.dat")) == false)

12
Ryujinx/Ui/MainWindow.cs
View file

@ -310,8 +310,8 @@ namespace Ryujinx.UI
Logger.PrintWarning(LogClass.Application, "Please specify a valid XCI/NCA/NSP/PFS0/NRO file."); Logger.PrintWarning(LogClass.Application, "Please specify a valid XCI/NCA/NSP/PFS0/NRO file.");
End(); End();
} }
new Thread(new ThreadStart(CreateGameWindow)).Start(); new Thread(new ThreadStart(CreateGameWindow)).Start();
_gameLoaded = true; _gameLoaded = true;
_stopEmulation.Sensitive = true; _stopEmulation.Sensitive = true;
@ -353,7 +353,7 @@ namespace Ryujinx.UI
try try
{ {
string savePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFS", "GUI", _userId, _device.System.TitleID); string savePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFs", "GUI", _userId, _device.System.TitleID);
if (File.Exists(System.IO.Path.Combine(savePath, "TimePlayed.dat")) == false) if (File.Exists(System.IO.Path.Combine(savePath, "TimePlayed.dat")) == false)
{ {
@ -406,7 +406,7 @@ namespace Ryujinx.UI
{ {
try try
{ {
string savePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFS", "GUI", _userId, _device.System.TitleID); string savePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFs", "GUI", _userId, _device.System.TitleID);
double currentPlayTime = 0; double currentPlayTime = 0;
using (FileStream stream = File.OpenRead(System.IO.Path.Combine(savePath, "LastPlayed.dat"))) using (FileStream stream = File.OpenRead(System.IO.Path.Combine(savePath, "LastPlayed.dat")))
@ -471,7 +471,7 @@ namespace Ryujinx.UI
private void FavToggle_Toggled(object o, ToggledArgs args) private void FavToggle_Toggled(object o, ToggledArgs args)
{ {
_tableStore.GetIter(out TreeIter treeIter, new TreePath(args.Path)); _tableStore.GetIter(out TreeIter treeIter, new TreePath(args.Path));
string savePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFS", "GUI", _userId, _tableStore.GetValue(treeIter, 2).ToString().Split("\n")[1]); string savePath = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFs", "GUI", _userId, _tableStore.GetValue(treeIter, 2).ToString().Split("\n")[1].ToLower());
if ((bool)_tableStore.GetValue(treeIter, 0)) if ((bool)_tableStore.GetValue(treeIter, 0))
{ {
@ -582,7 +582,7 @@ namespace Ryujinx.UI
private void Update_Pressed(object o, EventArgs args) private void Update_Pressed(object o, EventArgs args)
{ {
string ryuUpdater = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFS", "RyuUpdater.exe"); string ryuUpdater = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RyuFs", "RyuUpdater.exe");
try try
{ {