Reordered members for multithreading reasons.

NuiCpp · Nov 20, 2023 · ede74ea · ede74ea
1 parent 88949b4
commit ede74ea
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/nui/src/nui/backend/window.cpp b/nui/src/nui/backend/window.cpp
@@ -114,23 +114,23 @@ namespace Nui
 {
     struct Window::Implementation : public std::enable_shared_from_this<Implementation>
     {
+        std::recursive_mutex viewGuard;
+        boost::asio::thread_pool pool;
         std::unique_ptr<webview::webview> view;
         std::vector<std::filesystem::path> cleanupFiles;
         std::unordered_map<std::string, std::function<void(nlohmann::json const&)>> callbacks;
-        boost::asio::thread_pool pool;
-        std::recursive_mutex viewGuard;
         int width;
         int height;
         std::function<void(std::string_view)> onRpcError;
 
         virtual void registerSchemeHandlers(WindowOptions const& options) = 0;
 
         Implementation()
-            : view{}
+            : viewGuard{}
+            , pool{4}
+            , view{}
             , cleanupFiles{}
             , callbacks{}
-            , pool{4}
-            , viewGuard{}
             , width{0}
             , height{0}
             , onRpcError{}
@@ -270,6 +270,7 @@ namespace Nui
     //---------------------------------------------------------------------------------------------------------------------
     Window::~Window()
     {
+        impl_.reset();
         for (auto const& file : impl_->cleanupFiles)
             std::filesystem::remove(file);
     }