manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-14 22:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use separate variable to handle relaunches + fix action menu

Browse source
This commit is contained in:
sharmander 2022-02-09 15:24:15 -05:00
parent b3202b52af
commit e26d9d3867
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Ryujinx/Ui/MainWindow.cs
View file

@ -73,6 +73,7 @@ namespace Ryujinx.Ui
private bool _ending; private bool _ending;
private string _currentEmulatedGamePath = null; private string _currentEmulatedGamePath = null;
private string _mostRecentlyLaunchedGamePath = null;
private string _lastScannedAmiiboId = ""; private string _lastScannedAmiiboId = "";
private bool _lastScannedAmiiboShowAll = false; private bool _lastScannedAmiiboShowAll = false;
@ -676,7 +677,7 @@ namespace Ryujinx.Ui
} }
} }
public void LoadApplication(string path, bool startFullscreen = false) public void LoadApplication(string path, bool startFullscreen = false, bool isUserSpecifiedPath = false)
{ {
if (_gameLoaded) if (_gameLoaded)
{ {
@ -837,6 +838,11 @@ namespace Ryujinx.Ui
_currentEmulatedGamePath = path; _currentEmulatedGamePath = path;
if (isUserSpecifiedPath)
{
_mostRecentlyLaunchedGamePath = path;
}
_deviceExitStatus.Reset(); _deviceExitStatus.Reset();
Translator.IsReadyForTranslation.Reset(); Translator.IsReadyForTranslation.Reset();
@ -855,12 +861,14 @@ namespace Ryujinx.Ui
#endif #endif
_gameLoaded = true; _gameLoaded = true;
_actionMenu.Sensitive = true; _lastScannedAmiiboId = "";
_lastScannedAmiiboId = ""; Application.Invoke(delegate
{
_firmwareInstallFile.Sensitive = false; _actionMenu.Sensitive = true;
_firmwareInstallDirectory.Sensitive = false; _firmwareInstallFile.Sensitive = false;
_firmwareInstallDirectory.Sensitive = false;
});
DiscordIntegrationModule.SwitchToPlayingState(_emulationContext.Application.TitleIdText, _emulationContext.Application.TitleName); DiscordIntegrationModule.SwitchToPlayingState(_emulationContext.Application.TitleIdText, _emulationContext.Application.TitleName);
@ -945,9 +953,11 @@ namespace Ryujinx.Ui
UpdateGameTable(); UpdateGameTable();
Task.Run(RefreshFirmwareLabel); Task.Run(RefreshFirmwareLabel);
Task.Run(HandleRelaunch);
_actionMenu.Sensitive = false; _actionMenu.Sensitive = false;
Task.Run(HandleRelaunch);
_firmwareInstallFile.Sensitive = true; _firmwareInstallFile.Sensitive = true;
_firmwareInstallDirectory.Sensitive = true; _firmwareInstallDirectory.Sensitive = true;
} }
@ -1169,7 +1179,7 @@ namespace Ryujinx.Ui
string path = (string)_tableStore.GetValue(treeIter, 9); string path = (string)_tableStore.GetValue(treeIter, 9);
LoadApplication(path); LoadApplication(path, /*startFullscreen=*/false, /*isUserSelectedPath=*/true);
} }
private void VSyncStatus_Clicked(object sender, ButtonReleaseEventArgs args) private void VSyncStatus_Clicked(object sender, ButtonReleaseEventArgs args)
@ -1255,7 +1265,7 @@ namespace Ryujinx.Ui
if (fileChooser.Run() == (int)ResponseType.Accept) if (fileChooser.Run() == (int)ResponseType.Accept)
{ {
LoadApplication(fileChooser.Filename); LoadApplication(fileChooser.Filename, /*startFullscreen=*/false, /*isUserSpecifiedPath=*/true);
} }
} }
} }
@ -1266,7 +1276,7 @@ namespace Ryujinx.Ui
{ {
if (fileChooser.Run() == (int)ResponseType.Accept) if (fileChooser.Run() == (int)ResponseType.Accept)
{ {
LoadApplication(fileChooser.Filename); LoadApplication(fileChooser.Filename, /*startFullscreen=*/false, /*isUserSpecifiedPath=*/true);
} }
} }
} }
@ -1513,7 +1523,7 @@ namespace Ryujinx.Ui
{ {
_userChannelPersistence.ShouldRestart = false; _userChannelPersistence.ShouldRestart = false;
LoadApplication(_currentEmulatedGamePath); LoadApplication(_mostRecentlyLaunchedGamePath);
} }
else else
{ {