Skip to content

Fix: #2762 + OnExiting Updates V2 #2789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WeylonSantana merged 1 commit into from
Dec 27, 2025
Merged

Fix: #2762 + OnExiting Updates V2 #2789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 38 additions & 37 deletions Intersect.Client.Core/Interface/Game/SimplifiedEscapeMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public SimplifiedEscapeMenu(Canvas gameCanvas, Func<SettingsWindow> settingsWind
_settings.Clicked += OpenSettingsWindow;
_character.Clicked += LogoutToCharacterSelectSelectClicked;
_logout.Clicked += LogoutToMainToMainMenuClicked;
_exit.Clicked += ExitToDesktopToDesktopClicked;
_exit.Clicked += ExitToDesktopClicked;

LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer?.GetResolutionString());
}
Expand Down Expand Up @@ -80,7 +80,13 @@ private void LogoutToCharacterSelectSelectClicked(Base sender, MouseButtonState
{
if (Globals.Me?.CombatTimer > Timing.Global.Milliseconds)
{
ShowCombatWarning();
AlertWindow.Open(
Strings.Combat.WarningCharacterSelect,
Strings.Combat.WarningTitle,
AlertType.Warning,
handleSubmit: LogoutToCharacterSelect,
inputType: InputType.YesNo
);
}
else
{
Expand All @@ -92,37 +98,51 @@ private void LogoutToMainToMainMenuClicked(Base sender, MouseButtonState argumen
{
if (Globals.Me?.CombatTimer > Timing.Global.Milliseconds)
{
ShowCombatWarning();
AlertWindow.Open(
Strings.Combat.WarningLogout,
Strings.Combat.WarningTitle,
AlertType.Warning,
handleSubmit: LogoutToMainMenu,
inputType: InputType.YesNo
);
}
else
{
LogoutToMainMenu(null, null);
}
}

private void ExitToDesktopToDesktopClicked(Base sender, MouseButtonState arguments)
private void ExitToDesktopClicked(Base sender, MouseButtonState arguments)
{
if (Globals.Me?.CombatTimer > Timing.Global.Milliseconds)
if (Globals.Me?.CombatTimer > Timing.Global?.Milliseconds)
{
ShowCombatWarning();
AlertWindow.Open(
Strings.Combat.WarningExitDesktop,
Strings.Combat.WarningTitle,
AlertType.Warning,
inputType: InputType.YesNo,
handleSubmit: (_, _) =>
{
Globals.Me.CombatTimer = 0;
Globals.IsRunning = false;
}
);
}
else
{
ExitToDesktop(null, null);
AlertWindow.Open(
Strings.General.QuitPrompt,
Strings.General.QuitTitle,
AlertType.Warning,
inputType: InputType.YesNo,
handleSubmit: (_, _) =>
{
Globals.IsRunning = false;
}
);
}
}

private static void ShowCombatWarning()
{
AlertWindow.Open(
Strings.Combat.WarningCharacterSelect,
Strings.Combat.WarningTitle,
AlertType.Warning,
handleSubmit: LogoutToCharacterSelect,
inputType: InputType.YesNo
);
}

private void OpenSettingsWindow(object? sender, EventArgs? e)
{
var settingsWindow = _settingsWindowProvider();
Expand Down Expand Up @@ -153,23 +173,4 @@ private static void LogoutToMainMenu(object? sender, EventArgs? e)

Main.Logout(false);
}

private static void ExitToDesktop(object? sender, EventArgs? e)
{
AlertWindow.Open(
Strings.General.QuitPrompt,
Strings.General.QuitTitle,
AlertType.Warning,
inputType: InputType.YesNo,
handleSubmit: (_, _) =>
{
if (Globals.Me != null)
{
Globals.Me.CombatTimer = 0;
}

Globals.IsRunning = false;
}
);
}
}
89 changes: 40 additions & 49 deletions Intersect.Client.Core/MonoGame/IntersectGame.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ internal partial class IntersectGame : Game

private GraphicsDeviceManager mGraphics;

private bool _isShowingExitConfirmation = false;

#region "Autoupdate Variables"

private Updater? _updater;
Expand Down Expand Up @@ -341,64 +339,57 @@ protected override void Draw(GameTime gameTime)

protected override void OnExiting(object sender, ExitingEventArgs args)
{
// If already showing dialog, just cancel and return
if (_isShowingExitConfirmation)
// If game is already shutting down, allow it to exit normally
if (!Globals.IsRunning)
{
args.Cancel = true;
ApplicationContext.Context.Value?.Logger.LogInformation("System window closing (due to user interaction most likely).");
TryExit(sender, args);
return;
}

ApplicationContext.Context.Value?.Logger.LogInformation("System window closing (due to user interaction most likely).");

// Check if player is logged in and in game
if (Globals.Me != null && Globals.LoggedIn && Globals.GameState == GameStates.InGame)
{
// Set flag to prevent multiple dialogs
_isShowingExitConfirmation = true;

// Check if player is in combat
bool inCombat = Globals.Me.CombatTimer > Timing.Global?.Milliseconds;
// Cancel the exit event
args.Cancel = true;

// Cancel the exit event
args.Cancel = true;
// Check if there's a player in combat
bool inCombat = Globals.Me != null &&
Globals.Me.CombatTimer > Timing.Global?.Milliseconds &&
Globals.GameState == GameStates.InGame;

if (inCombat)
{
// Show combat warning
var inputBox = new InputBox(
title: Strings.Combat.WarningTitle,
prompt: Strings.Combat.WarningExitDesktop,
inputType: InputType.YesNo,
onSubmit: (s, e) =>
if (inCombat)
{
AlertWindow.Open(
Strings.Combat.WarningExitDesktop,
Strings.Combat.WarningTitle,
AlertType.Warning,
inputType: InputType.YesNo,
handleSubmit: (_, _) =>
{
if (Globals.Me != null)
{
Globals.Me.CombatTimer = 0;
_isShowingExitConfirmation = false;
Globals.IsRunning = false;
},
onCancel: (s, e) => { _isShowingExitConfirmation = false; }
);
inputBox.Closed += (s, e) => { _isShowingExitConfirmation = false; };
}
else
{
// Show quit confirmation
var inputBox = new InputBox(
title: Strings.General.QuitTitle,
prompt: Strings.General.QuitPrompt,
inputType: InputType.YesNo,
onSubmit: (s, e) =>
{
_isShowingExitConfirmation = false;
Globals.IsRunning = false;
},
onCancel: (s, e) => { _isShowingExitConfirmation = false; }
);
inputBox.Closed += (s, e) => { _isShowingExitConfirmation = false; };
}
}

return;
Globals.IsRunning = false;
}
);
}
else
{
AlertWindow.Open(
Strings.General.QuitPrompt,
Strings.General.QuitTitle,
AlertType.Warning,
inputType: InputType.YesNo,
handleSubmit: (_, _) =>
{
Globals.IsRunning = false;
}
);
}
}

private void TryExit(object sender, ExitingEventArgs args)
{
try
{
_updater?.Stop();
Expand Down
6 changes: 6 additions & 0 deletions Intersect.Client.Framework/Gwen/Control/Base.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,12 @@ public bool IsHidden

private static void SetVisible(Base @this, bool value)
{
// Check if already disposed
if (@this._disposed)
{
return;
}

var wasVisibleInParent = @this._visible;

if (@this.GetType().Name == "VersionPanel")
Expand Down
9 changes: 8 additions & 1 deletion Intersect.Client.Framework/Gwen/Control/WindowControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,14 @@ private void Close(Base sender, EventArgs args)
return;
}

IsHidden = true;
try
{
IsHidden = true;
}
catch (ObjectDisposedException)
{
// Canvas already disposed during shutdown, this is fine
}

if (_modal != null)
{
Expand Down
Loading