修复最近修改的dialog关闭动画可能导致窗口卡死的BUG。

ver:4.6.0.5
soui4 · Sep 21, 2023 · be9e5d9 · be9e5d9
1 parent 53f4465
commit be9e5d9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/SOUI/include/soui-version.h b/SOUI/include/soui-version.h
@@ -10,4 +10,4 @@
 #define SOUI_VER1 4
 #define SOUI_VER2 6
 #define SOUI_VER3 0
-#define SOUI_VER4 4
+#define SOUI_VER4 5
diff --git a/SOUI/src/core/SHostDialog.cpp b/SOUI/src/core/SHostDialog.cpp
@@ -61,17 +61,18 @@ INT_PTR SHostDialog::DoModal(HWND hParent /*=NULL*/)
 
         int nRet = m_MsgLoop->Run();
 
-        if (m_nRetCode == RC_INIT)
-        { //不是自己主动使用EndDialog关闭窗口，重新把WM_QUIT放回消息队列。
-            PostQuitMessage(nRet);
-        }
         // From MFC
         // hide the window before enabling the parent, etc.
         if (IsWindow())
         {
             ShowHostWnd(SW_HIDE, TRUE);
         }
 
+        if (m_nRetCode == RC_INIT)
+        { //不是自己主动使用EndDialog关闭窗口，重新把WM_QUIT放回消息队列。
+            PostQuitMessage(nRet);
+        }
+
         if (bEnableParent)
         {
             ::EnableWindow(hParent, TRUE);

diff --git a/SOUI/src/core/SMsgLoop.cpp b/SOUI/src/core/SMsgLoop.cpp
@@ -231,13 +231,13 @@ BOOL SMessageLoop::PeekMsg(THIS_ LPMSG pMsg, UINT wMsgFilterMin, UINT wMsgFilter
 BOOL SMessageLoop::WaitMsg(THIS)
 {
     MSG msg;
-    while (m_bDoIdle && !PeekMsg(&msg, 0, 0, FALSE))
+    while (!m_bQuit && m_bDoIdle && !PeekMsg(&msg, 0, 0, FALSE))
     {
         if (!OnIdle(m_nIdleCount++))
             m_bDoIdle = FALSE;
-        if (m_bQuit)
-            return FALSE;
     }
+    if (m_bQuit)
+        return FALSE;
     return ::WaitMessage();
 }
 

diff --git a/SOUI/src/core/shostwnd.cpp b/SOUI/src/core/shostwnd.cpp
@@ -1925,7 +1925,8 @@ void SHostWnd::ShowHostWnd(THIS_ int nShowCmd, BOOL bWaitAniDone)
         SApplication::getSingletonPtr()->GetMsgLoopFactory()->CreateMsgLoop(&msgLoop, GetMsgLoop());
         for (; m_AniState & Ani_win;)
         {
-            msgLoop->WaitMsg();
+            if(!msgLoop->WaitMsg())
+                break;
             msgLoop->HandleMsg();
         }
     }