fix crash

mehah · Dec 30, 2023 · be63cd8 · be63cd8 · BenDol · Jan 2, 2024
1 parent 5fd911b
commit be63cd8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp
@@ -110,7 +110,7 @@ void Application::deinit()
 
     // disable dispatcher events
     g_textDispatcher.shutdown();
-    g_dispatcher.shutdown();         
+    g_dispatcher.shutdown();
     g_mainDispatcher.shutdown();
 
     // run modules unload events
@@ -145,13 +145,17 @@ void Application::terminate()
 
 void Application::poll()
 {
+    std::scoped_lock l(g_drawPool.get(DrawPoolType::FOREGROUND_MAP)->getMutexPreDraw());
     g_clock.update();
 
 #ifdef FRAMEWORK_NET
     Connection::poll();
 #endif
 
-    dispatchPoll();
+    {
+        std::scoped_lock l(g_drawPool.get(DrawPoolType::FOREGROUND)->getMutexPreDraw());
+        g_dispatcher.poll();
+    }
 
     // poll connection again to flush pending write
 #ifdef FRAMEWORK_NET
@@ -161,11 +165,6 @@ void Application::poll()
     g_clock.update();
 }
 
-void Application::dispatchPoll()
-{
-    g_dispatcher.poll();
-}
-
 void Application::exit()
 {
     g_lua.callGlobalField<bool>("g_app", "onExit");

diff --git a/src/framework/core/application.h b/src/framework/core/application.h
@@ -37,7 +37,7 @@ class ApplicationContext
     uint8_t m_asyncDispatchMaxThreads;
 };
 
- //@bindsingleton g_app
+//@bindsingleton g_app
 class Application
 {
 public:
@@ -48,7 +48,6 @@ class Application
     virtual void terminate();
     virtual void run() = 0;
     virtual void poll();
-    virtual void dispatchPoll();
     virtual void exit();
     virtual void close();
     virtual void restart();

diff --git a/src/framework/core/graphicalapplication.cpp b/src/framework/core/graphicalapplication.cpp
@@ -269,15 +269,6 @@ void GraphicalApplication::poll()
         g_textDispatcher.poll();
     }
 }
-
-void GraphicalApplication::dispatchPoll()
-{
-    std::scoped_lock l(g_drawPool.get(DrawPoolType::FOREGROUND)->getMutexPreDraw(),
-                       g_drawPool.get(DrawPoolType::FOREGROUND_MAP)->getMutexPreDraw());
-
-    Application::dispatchPoll();
-}
-
 void GraphicalApplication::mainPoll()
 {
     g_clock.update();

diff --git a/src/framework/core/graphicalapplication.h b/src/framework/core/graphicalapplication.h
@@ -75,7 +75,6 @@ class GraphicalApplication : public Application
     void terminate() override;
     void run() override;
     void poll() override;
-    void dispatchPoll() override;
     void mainPoll();
     void close() override;
 
@@ -95,7 +94,7 @@ class GraphicalApplication : public Application
 #else
         return false;
 #endif
-}
+    }
     bool isForcedEffectOptimization() { return m_forceEffectOptimization; }
 
     void optimize(const bool optimize) { m_optimize = optimize; }