mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2026-06-02 02:19:14 +00:00
Compare commits
22 Commits
Canary-1.3
...
update/dot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebc775aeb5 | ||
|
|
e24eb13e07 | ||
|
|
c7572b5d30 | ||
|
|
2ea829f17b | ||
|
|
9c00ffa4b1 | ||
|
|
84f26f7276 | ||
|
|
f2105d6040 | ||
|
|
1f3e4674b5 | ||
|
|
342c811aca | ||
|
|
83502494d9 | ||
|
|
64238e6ec3 | ||
|
|
36bd919c53 | ||
|
|
f1df537e76 | ||
|
|
f9e71a5908 | ||
|
|
f20291ddf2 | ||
|
|
cc80621a17 | ||
|
|
6a1dec9f91 | ||
|
|
274ec74856 | ||
|
|
ac98ade572 | ||
|
|
e23213d290 | ||
|
|
6467720c5c | ||
|
|
010eab44ba |
@@ -92,7 +92,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
short[] outputBuffer = ArrayPool<short>.Shared.Rent((int)inputCount * SampleCount);
|
short[] outputBuffer = ArrayPool<short>.Shared.Rent((int)inputCount * SampleCount);
|
||||||
Array.Fill(outputBuffer, (short)0, 0, (int)inputCount * SampleCount);
|
|
||||||
|
|
||||||
for (int i = 0; i < bufferCount; i++)
|
for (int i = 0; i < bufferCount; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -330,7 +330,6 @@ namespace Ryujinx.Input.HLE
|
|||||||
|
|
||||||
_device.TamperMachine.UpdateInput(hleInputStates);
|
_device.TamperMachine.UpdateInput(hleInputStates);
|
||||||
|
|
||||||
hleMotionStates.Clear();
|
|
||||||
_hleMotionStatesPool.Release(hleMotionStates);
|
_hleMotionStatesPool.Release(hleMotionStates);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -233,8 +233,6 @@ namespace Ryujinx.Ava
|
|||||||
{
|
{
|
||||||
Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");
|
Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");
|
||||||
|
|
||||||
ConfigurationFileFormat.RenameInvalidConfigFile(ConfigurationPath);
|
|
||||||
|
|
||||||
ConfigurationState.Instance.LoadDefault();
|
ConfigurationState.Instance.LoadDefault();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,7 @@ using Ryujinx.Common.Configuration.Multiplayer;
|
|||||||
using Ryujinx.Common.Logging;
|
using Ryujinx.Common.Logging;
|
||||||
using Ryujinx.Common.Utilities;
|
using Ryujinx.Common.Utilities;
|
||||||
using Ryujinx.HLE;
|
using Ryujinx.HLE;
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.IO;
|
|
||||||
|
|
||||||
namespace Ryujinx.Ava.Systems.Configuration
|
namespace Ryujinx.Ava.Systems.Configuration
|
||||||
{
|
{
|
||||||
@@ -512,43 +510,6 @@ namespace Ryujinx.Ava.Systems.Configuration
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Renames the configuration file when it is deemed invalid
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="path">The path to the invalid JSON configuration file</param>
|
|
||||||
/// <returns>The path of the renamed invalid JSON configuration file, or null if the rename failed</returns>
|
|
||||||
public static string RenameInvalidConfigFile(string path)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(path) || !File.Exists(path))
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
string directory = Path.GetDirectoryName(path) ?? string.Empty;
|
|
||||||
string originalFileName = Path.GetFileName(path);
|
|
||||||
if (string.IsNullOrWhiteSpace(originalFileName))
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
string renamedFileName = $"{originalFileName}.{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.invalid";
|
|
||||||
string renamedPath = string.IsNullOrEmpty(directory) ? renamedFileName : Path.Combine(directory, renamedFileName);
|
|
||||||
|
|
||||||
File.Move(path, renamedPath, overwrite: false);
|
|
||||||
|
|
||||||
Logger.Warning?.PrintMsg(LogClass.Application, $"Invalid configuration renamed to: {renamedPath}");
|
|
||||||
|
|
||||||
return renamedPath;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Logger.Error?.PrintMsg(LogClass.Application, $"Failed to rename invalid configuration file \"{path}\": {ex}");
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Save a configuration file to disk
|
/// Save a configuration file to disk
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -28,8 +28,6 @@ namespace Ryujinx.Ava.Systems.Configuration
|
|||||||
{
|
{
|
||||||
RyuLogger.Warning?.Print(LogClass.Application, $"Unsupported configuration version {cff.Version}, loading default.");
|
RyuLogger.Warning?.Print(LogClass.Application, $"Unsupported configuration version {cff.Version}, loading default.");
|
||||||
|
|
||||||
ConfigurationFileFormat.RenameInvalidConfigFile(configurationFilePath);
|
|
||||||
|
|
||||||
LoadDefault();
|
LoadDefault();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user