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

Fix exception on engine closing in some cases

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-17 11:12:20 +01:00
parent 8fb27e6f83
commit aa1c200bf8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/Editor.cs
View File

@@ -1166,7 +1166,7 @@ namespace FlaxEditor
if (Windows.GameWin != null && Windows.GameWin.ContainsFocus) if (Windows.GameWin != null && Windows.GameWin.ContainsFocus)
{ {
var win = Windows.GameWin.Root; var win = Windows.GameWin.Root;
if (win != null && win.RootWindow is WindowRootControl root && root.Window.IsFocused) if (win?.RootWindow is WindowRootControl root && root.Window && root.Window.IsFocused)
{ {
return true; return true;
} }
@@ -1179,7 +1179,7 @@ namespace FlaxEditor
if (Windows.GameWin != null && Windows.GameWin.ContainsFocus) if (Windows.GameWin != null && Windows.GameWin.ContainsFocus)
{ {
var win = Windows.GameWin.Root; var win = Windows.GameWin.Root;
if (win != null && win.RootWindow is WindowRootControl root && root.Window.IsFocused) if (win?.RootWindow is WindowRootControl root && root.Window && root.Window.IsFocused)
{ {
pos = Vector2.Round(Windows.GameWin.Viewport.PointFromScreen(pos) * root.DpiScale); pos = Vector2.Round(Windows.GameWin.Viewport.PointFromScreen(pos) * root.DpiScale);
} }
@@ -1199,7 +1199,7 @@ namespace FlaxEditor
if (Windows.GameWin != null && Windows.GameWin.ContainsFocus) if (Windows.GameWin != null && Windows.GameWin.ContainsFocus)
{ {
var win = Windows.GameWin.Root; var win = Windows.GameWin.Root;
if (win != null && win.RootWindow is WindowRootControl root && root.Window.IsFocused) if (win?.RootWindow is WindowRootControl root && root.Window && root.Window.IsFocused)
{ {
pos = Vector2.Round(Windows.GameWin.Viewport.PointToScreen(pos / root.DpiScale)); pos = Vector2.Round(Windows.GameWin.Viewport.PointToScreen(pos / root.DpiScale));
} }