From 914c1ec51a13fdc4d8d84bb64becb29848cb40c3 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Tue, 19 Jul 2016 10:33:27 -1000 Subject: [PATCH] ViewManager destruction order fix --- Editor/ViewManager.hpp | 2 +- hecl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index d232d73fb..e4c58bba4 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -24,6 +24,7 @@ class ViewManager : public specter::IViewManager friend class RootSpace; friend class SplitSpace; + std::unique_ptr m_mainWindow; hecl::Runtime::FileStoreManager& m_fileStoreManager; hecl::CVarManager& m_cvarManager; ProjectManager m_projManager; @@ -33,7 +34,6 @@ class ViewManager : public specter::IViewManager boo::GraphicsDataToken m_iconsToken; boo::GraphicsDataToken m_badgeToken; specter::Translator m_translator; - std::unique_ptr m_mainWindow; boo::IGraphicsDataFactory* m_mainBooFactory = nullptr; boo::IGraphicsCommandQueue* m_mainCommandQueue = nullptr; boo::ITextureR* m_renderTex = nullptr; diff --git a/hecl b/hecl index 239a73cba..c2ebe6e7d 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 239a73cba2f780e0d8e3190806b0f98dae4be626 +Subproject commit c2ebe6e7dc87c556804b66f4220d159be0767fa4