GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for Game window before usage to avoid errors in trying to unplay.

Browse Source
This commit is contained in:
Chandler Cox
2025-05-23 18:16:48 -05:00
parent 9ba1c4c338
commit 9753e579c1
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Editor/Modules/SimulationModule.cs
View File

@@ -306,19 +306,21 @@ namespace FlaxEditor.Modules
public override void OnPlayEnd() public override void OnPlayEnd()
{ {
var gameWin = Editor.Windows.GameWin; var gameWin = Editor.Windows.GameWin;
if (gameWin != null)
switch (gameWin.FocusOnPlayOption)
{ {
case Options.InterfaceOptions.PlayModeFocus.None: break; switch (gameWin.FocusOnPlayOption)
case Options.InterfaceOptions.PlayModeFocus.GameWindow: break;
case Options.InterfaceOptions.PlayModeFocus.GameWindowThenRestore:
if (_previousWindow != null && !_previousWindow.IsDisposing)
{ {
if (!Editor.Windows.GameWin.ParentDockPanel.ContainsTab(_previousWindow)) case Options.InterfaceOptions.PlayModeFocus.None: break;
break; case Options.InterfaceOptions.PlayModeFocus.GameWindow: break;
_previousWindow.Focus(); case Options.InterfaceOptions.PlayModeFocus.GameWindowThenRestore:
if (_previousWindow != null && !_previousWindow.IsDisposing)
{
if (!Editor.Windows.GameWin.ParentDockPanel.ContainsTab(_previousWindow))
break;
_previousWindow.Focus();
}
break;
} }
break;
} }
Editor.UI.UncheckPauseButton(); Editor.UI.UncheckPauseButton();