diff --git a/Source/Editor/Content/Proxy/FileProxy.cs b/Source/Editor/Content/Proxy/FileProxy.cs index 4e12ab588..d162e5f35 100644 --- a/Source/Editor/Content/Proxy/FileProxy.cs +++ b/Source/Editor/Content/Proxy/FileProxy.cs @@ -32,6 +32,14 @@ namespace FlaxEditor.Content /// public override EditorWindow Open(Editor editor, ContentItem item) { +#if PLATFORM_WINDOWS + CreateProcessSettings settings = new CreateProcessSettings + { + ShellExecute = true, + FileName = item.Path + }; + Platform.CreateProcess(ref settings); +#endif return null; } diff --git a/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs b/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs index 302508f5c..a1dc73068 100644 --- a/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs +++ b/Source/Editor/GUI/Docking/FloatWindowDockPanel.cs @@ -139,6 +139,8 @@ namespace FlaxEditor.GUI.Docking /// protected override void OnLastTabRemoved() { + if (ChildPanelsCount > 0) + return; // Close window _window?.Close(); } diff --git a/Source/Editor/ProjectInfo.cpp b/Source/Editor/ProjectInfo.cpp index 7fef490fe..2fe8e2b1e 100644 --- a/Source/Editor/ProjectInfo.cpp +++ b/Source/Editor/ProjectInfo.cpp @@ -60,14 +60,13 @@ Vector3 GetVector3FromXml(const xml_node& parent, const PUGIXML_CHAR* name, cons if (x && y && z) { XmlCharAsChar xs(x), ys(y), zs(z); - Vector3 v; + Float3 v; if (!StringUtils::Parse(xs.Str, &v.X) && !StringUtils::Parse(ys.Str, &v.Y) && !StringUtils::Parse(zs.Str, &v.Z)) { - return v; + return (Vector3)v; } } } - return defaultValue; } diff --git a/Source/Engine/Video/MF/VideoBackendMF.cpp b/Source/Engine/Video/MF/VideoBackendMF.cpp index 727a94158..d396d7672 100644 --- a/Source/Engine/Video/MF/VideoBackendMF.cpp +++ b/Source/Engine/Video/MF/VideoBackendMF.cpp @@ -397,6 +397,7 @@ namespace MF // Loop playerMF.Time.Ticks %= player.Duration.Ticks; playerMF.Seek = 1; + player.PlayAudio(); } else {