mirror of
https://git.naxdy.org/Mirror/Ryujinx.git
synced 2025-01-09 20:29:11 +00:00
Working on close functionality
This commit is contained in:
parent
f424eb58fd
commit
a15ab408eb
2 changed files with 12 additions and 15 deletions
|
@ -1,4 +1,3 @@
|
||||||
using Avalonia.Controls;
|
|
||||||
using Gtk;
|
using Gtk;
|
||||||
using LibHac.Common;
|
using LibHac.Common;
|
||||||
using LibHac.Common.Keys;
|
using LibHac.Common.Keys;
|
||||||
|
@ -1444,18 +1443,7 @@ namespace Ryujinx.UI
|
||||||
_resumeEmulation.Sensitive = false;
|
_resumeEmulation.Sensitive = false;
|
||||||
UpdateMenuItem.Sensitive = true;
|
UpdateMenuItem.Sensitive = true;
|
||||||
|
|
||||||
Logger.Warning?.Print(LogClass.Emulation, "afgadfgasgfgsjhfgdsjfgds" + ConfigurationState.Instance.CloseOnEmulatorStop.Value);
|
RendererWidget?.Exit();
|
||||||
//Shutdown if "Close Ryujinx on Emulator Stop" is enabled
|
|
||||||
if (ConfigurationState.Instance.CloseOnEmulatorStop.Value)
|
|
||||||
{
|
|
||||||
Logger.Warning?.Print(LogClass.Emulation, "Shut Ryujinx down" + ConfigurationState.Instance.CloseOnEmulatorStop.Value);
|
|
||||||
UserControl.CloseWindow();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Logger.Warning?.Print(LogClass.Emulation, "Don't shut Ryujinx down" + ConfigurationState.Instance.CloseOnEmulatorStop.Value);
|
|
||||||
RendererWidget?.Exit();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PauseEmulation_Pressed(object sender, EventArgs args)
|
private void PauseEmulation_Pressed(object sender, EventArgs args)
|
||||||
|
@ -1464,7 +1452,7 @@ namespace Ryujinx.UI
|
||||||
_resumeEmulation.Sensitive = true;
|
_resumeEmulation.Sensitive = true;
|
||||||
_emulationContext.System.TogglePauseEmulation(true);
|
_emulationContext.System.TogglePauseEmulation(true);
|
||||||
Title = TitleHelper.ActiveApplicationTitle(_emulationContext.Processes.ActiveApplication, Program.Version, "Paused");
|
Title = TitleHelper.ActiveApplicationTitle(_emulationContext.Processes.ActiveApplication, Program.Version, "Paused");
|
||||||
Logger.Info?.Print(LogClass.Emulation, "Emulation was dinkleberry");
|
Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ResumeEmulation_Pressed(object sender, EventArgs args)
|
private void ResumeEmulation_Pressed(object sender, EventArgs args)
|
||||||
|
|
|
@ -1004,7 +1004,16 @@ namespace Ryujinx.Ava
|
||||||
|
|
||||||
if (shouldExit)
|
if (shouldExit)
|
||||||
{
|
{
|
||||||
Stop();
|
//if (ConfigurationState.Instance.CloseOnEmulatorStop)
|
||||||
|
//{
|
||||||
|
// Console.WriteLine("quitting");
|
||||||
|
//Console.WriteLine("still quitting");
|
||||||
|
//}
|
||||||
|
//else
|
||||||
|
//{
|
||||||
|
Stop();
|
||||||
|
//}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue