Changeset 107001 in vbox for trunk

Timestamp:

Nov 14, 2024 11:50:32 AM (5 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165937

Message:

FE/Qt: bugref:9831. In help viewer widget listen to UICommon::sigAskToCommitData to avoid COM access in application exit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (5 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -52 +52 @@
 #include "QIToolBar.h"
 #include "QIToolButton.h"
+#include "UICommon.h"
 #include "UIExtraDataManager.h"
 #include "UIHelpViewer.h"
@@ -1369 +1370 @@
     , m_fModelContentCreated(false)
     , m_fIndexingFinished(false)
+    , m_fCommitDataSignalReceived(false)
 {
     qRegisterMetaType<HelpBrowserTabs>("HelpBrowserTabs");
@@ -1431 +1433 @@
     connect(&translationEventListener(), &UITranslationEventListener::sigRetranslateUI,
         this, &UIHelpBrowserWidget::sltRetranslateUI);
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIHelpBrowserWidget::sltCommitDataSignalReceived);
 }
 
@@ -1791 +1795 @@
 void UIHelpBrowserWidget::cleanup()
 {
+    if (m_fCommitDataSignalReceived)
+        return;
     saveOptions();
     saveBookmarks();
@@ -1838 +1844 @@
 }
 
+void UIHelpBrowserWidget::sltCommitDataSignalReceived()
+{
+    cleanup();
+    m_fCommitDataSignalReceived = true;
+}
 
 void UIHelpBrowserWidget::showEvent(QShowEvent *pEvent)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

@@ -121 +121 @@
     void sltMouseOverImage(const QString &strImageName);
     void sltRetranslateUI();
+    void sltCommitDataSignalReceived();
 
 private:
@@ -209 +210 @@
     bool                 m_fModelContentCreated;
     bool                 m_fIndexingFinished;
+    bool                 m_fCommitDataSignalReceived;
     /** This queue is used in unlikely case where possibly several keywords are requested to be shown
       *  but indexing is not yet finished. In that case we queue the keywords and process them after