Merge pull request #1023 from ONLYOFFICE/patch/hotfix/v7.5.1

Patch/hotfix/v7.5.1
ONLYOFFICE · Nov 1, 2023 · 3ffcdf7 · 3ffcdf7
2 parents d6285bf + 757d333
commit 3ffcdf7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/win-linux/src/cascapplicationmanagerwrapper.cpp b/win-linux/src/cascapplicationmanagerwrapper.cpp
@@ -475,7 +475,7 @@ bool CAscApplicationManagerWrapper::processCommonEvent(NSEditorApi::CAscCefMenuE
         } else
         if ( m_countViews == 1 && mainWindow() && mainWindow()->isAboutToClose() ) {        // if only start page exists
             emit aboutToQuit();
-            DestroyCefView(-1);
+//            DestroyCefView(-1);
         }
 
         break;
@@ -1253,7 +1253,9 @@ void CAscApplicationManagerWrapper::launchAppClose()
             }
         } else {
             emit aboutToQuit();
-            DestroyCefView(-1);
+            QTimer::singleShot(0, this, [=]() {
+                DestroyCefView(-1);
+            });
         }
     } else {
         cancelClose();

diff --git a/win-linux/src/platform_win/message.cpp b/win-linux/src/platform_win/message.cpp
@@ -80,6 +80,8 @@ int WinMsg::showMessage(QWidget *parent,
     std::wstring lpText = QTextDocumentFragment::fromHtml(msg).toPlainText().toStdWString();
     std::wstring lpCheckBoxText = chekBoxText.toStdWString();
     HWND parent_hwnd = (parent) ? (HWND)parent->winId() : nullptr;
+    if (parent_hwnd && IsIconic(parent_hwnd))
+        ShowWindow(parent_hwnd, SW_RESTORE);
 
     int msgboxID = 0;
 #ifndef __OS_WIN_XP

diff --git a/win-linux/src/windows/platform_win/cwindowplatform.cpp b/win-linux/src/windows/platform_win/cwindowplatform.cpp
@@ -192,7 +192,7 @@ bool CWindowPlatform::nativeEvent(const QByteArray &eventType, void *message, lo
         mrg.cyTopHeight = 29;
         DwmExtendFrameIntoClientArea(m_hWnd, &mrg);
 #endif
-        return true;
+        break;
     }
 
     case WM_DPICHANGED: {
@@ -415,7 +415,7 @@ bool CWindowPlatform::nativeEvent(const QByteArray &eventType, void *message, lo
     case WM_NCACTIVATE: {
         // Prevent the title bar from being drawn when the window is restored or maximized
         if (m_borderless) {
-            if (!msg->wParam) {
+            if (!LOWORD(msg->wParam)) {
                 *result = TRUE;
                 break;
             }