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

Fixed issues

Browse source
This commit is contained in:
DrHacknik 2020-01-23 14:22:49 -05:00 • committed by Ash
parent bedf8cc93e
commit 4ead6bca86
5 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ryujinx.sln
View file

@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Nvdec", "Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Debugger", "Ryujinx.Debugger\Ryujinx.Debugger.csproj", "{79E4EE34-9C5F-4BE6-8529-A49D32B5B0CC}"
EndProject

2
Ryujinx/Program.cs
View file

@ -64,7 +64,7 @@ namespace Ryujinx
MainWindow mainWindow = new MainWindow();
mainWindow.Show();
if (args.Length > 0)
if (args.Length == 1)
{
foreach (string arg in args)
{

11
Ryujinx/Ui/MainWindow.cs
View file

@ -897,17 +897,6 @@ namespace Ryujinx.Ui
private void Update_Pressed(object sender, EventArgs args)
{
Ryujinx.Updater.Parser.UpdateParser.BeginParse();
return;
//string ryuUpdater = System.IO.Path.Combine(new VirtualFileSystem().GetBasePath(), "RyuUpdater.exe");
//try
//{
// Process.Start(new ProcessStartInfo(ryuUpdater, "/U") { UseShellExecute = true });
//}
//catch(System.ComponentModel.Win32Exception)
//{
// GtkDialog.CreateErrorDialog("Update canceled by user or updater was not found");
//}
}
private void About_Pressed(object sender, EventArgs args)

13
Ryujinx/Updater/Parser/UpdateParser.cs
View file

@ -14,6 +14,7 @@ using System.Net;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using ZipFile = System.IO.Compression.ZipFile;
namespace Ryujinx.Updater.Parser
{
@ -21,14 +22,14 @@ namespace Ryujinx.Updater.Parser
{
private static string _jobid;
private static string _buildver;
private static string _buildurl = "https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master";
private static string _buildurl = "https://ci.appveyor.com/api/projects/gdkchan/ryujinx/branch/master";
private static string _buildcommit;
private static string _branch;
private static string _platformext;
public static string BuildArt;
public static string RyuDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx");
public static WebClient Package = new WebClient();
public static string RyuDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Ryujinx");
public static WebClient Package = new WebClient();
public static int PackageProgress;
public static double Percentage;
public static void BeginParse()
@ -139,11 +140,7 @@ namespace Ryujinx.Updater.Parser
try
{
//Begin the extaction process
using (Ionic.Zip.ZipFile Package = Ionic.Zip.ZipFile.Read(Path.Combine(RyuDir, "Data", "Update", "RyujinxPackage.zip")))
{
await Task.Run(() => Package.ExtractAll(Path.Combine(Environment.CurrentDirectory,"temp"), ExtractExistingFileAction.OverwriteSilently));
}
await Task.Run(() => ZipFile.ExtractToDirectory(Path.Combine(RyuDir, "Data", "Update", "RyujinxPackage.zip"), Path.Combine(Environment.CurrentDirectory, "temp")));
try
{
Process.Start(new ProcessStartInfo(Path.Combine(Environment.CurrentDirectory, "temp", "publish", "Ryujinx.exe"), "/U") { UseShellExecute = true });

9
Ryujinx/Updater/Update.cs
View file

@ -11,9 +11,9 @@ namespace Ryujinx.Updater
{
public class Update
{
private static string[] _updatefiles = Directory.GetFiles(Path.Combine(Environment.CurrentDirectory),"*", SearchOption.AllDirectories);
private static string _parentdir = Path.Combine(@"..\..");
public static string RyuDir = Environment.CurrentDirectory;
private static string[] _updatefiles = Directory.GetFiles(Path.Combine(Environment.CurrentDirectory),"*", SearchOption.AllDirectories);
private static string _parentdir = Path.Combine(@"..\..");
public static string RyuDir = Environment.CurrentDirectory;
public static void PerformUpdate()
{
try
@ -37,12 +37,10 @@ namespace Ryujinx.Updater
return;
}
Application.Quit();
return;
}
catch (System.ComponentModel.Win32Exception)
{
GtkDialog.CreateErrorDialog("Package installation has failed\nCheck the log for more information.");
return;
}
}
@ -50,7 +48,6 @@ namespace Ryujinx.Updater
public static void Cleanup()
{
Directory.Delete(Path.Combine(RyuDir, "temp"), true);
return;
}
}
}