Compare commits

...

2 Commits

Author SHA1 Message Date
Mary-nyan
3a3380fa25 fix: Ensure to load latest version of ffmpeg libraries first (#3473)
Fix a possible crash related to older version of ffmpeg being loaded
instewad of the one shipped with the emulator.
2022-07-24 11:39:56 +02:00
EmulationFanatic
2d252db0a7 GTK & Avalonia changes (#3480) 2022-07-23 12:05:51 -03:00
3 changed files with 6 additions and 6 deletions

View File

@@ -118,7 +118,7 @@
"SettingsTabSystemAudioBackendSoundIO": "SoundIO",
"SettingsTabSystemAudioBackendSDL2": "SDL2",
"SettingsTabSystemHacks": "Hacks",
"SettingsTabSystemHacksNote": " - These may cause instabilities",
"SettingsTabSystemHacksNote": " (may cause instability)",
"SettingsTabSystemExpandDramSize": "Expand DRAM Size to 6GB",
"SettingsTabSystemIgnoreMissingServices": "Ignore Missing Services",
"SettingsTabGraphics": "Graphics",

View File

@@ -45,7 +45,7 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
{
(int minVersion, int maxVersion) = value;
for (int version = minVersion; version <= maxVersion; version++)
for (int version = maxVersion; version >= minVersion; version--)
{
if (NativeLibrary.TryLoad(FormatLibraryNameForCurrentOs(libraryName, version), assembly, searchPath, out handle))
{

View File

@@ -1509,7 +1509,7 @@
</child>
<child>
<object class="GtkCheckButton" id="_internetToggle">
<property name="label" translatable="yes">Enable guest Internet access</property>
<property name="label" translatable="yes">Enable Guest Internet Access</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -1643,7 +1643,7 @@
</child>
<child>
<object class="GtkRadioButton" id="_mmHostUnsafe">
<property name="label" translatable="yes">Host unchecked (fastest, unsafe)</property>
<property name="label" translatable="yes">Host Unchecked (fastest, unsafe)</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
@@ -1725,7 +1725,7 @@
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes"> - These may cause instability</property>
<property name="label" translatable="yes"> (may cause instability)</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1749,7 +1749,7 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkCheckButton" id="_expandRamToggle">
<property name="label" translatable="yes">Expand DRAM size to 6GB</property>
<property name="label" translatable="yes">Expand DRAM Size to 6GB</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>