Changeset 92743 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 3, 2021 6:20:38 PM (3 years ago)

Author:

vboxsync

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

148650

Message:

FE/Qt: bugref:8161. Don't wait until destruction to release CMachine reference in log viewer dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerDialog.cpp (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (5 diffs)
• UIVMLogViewerWidget.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp ¶

@@ -71 +71 @@
 UIVMLogViewerDialog::~UIVMLogViewerDialog()
 {
-    UIVMLogViewerWidget *pWidget = qobject_cast<UIVMLogViewerWidget*>(widget());
-    if (pWidget)
-        pWidget->setDialogBeingClosed(true);
 }
 
@@ -150 +147 @@
     /* Create widget: */
     UIVMLogViewerWidget *pWidget = new UIVMLogViewerWidget(EmbedTo_Dialog, m_pActionPool, true /* show toolbar */, m_comMachine, this);
+    /* Release the CMachine reference as we don't need it anymore. Doing it during dtor causes problems since xcom might be gone already: */
+    m_comMachine.detach();
     if (pWidget)
     {

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp ¶

@@ -210 +210 @@
     , m_pCornerButton(0)
     , m_pMachineSelectionMenu(0)
-    , m_fDialogBeingClosed(false)
+    , m_fCommitDataSignalReceived(false)
 {
     /* Prepare VM Log-Viewer: */
@@ -217 +217 @@
     if (!comMachine.isNull())
         setMachines(QVector<QUuid>(1, comMachine.GetId()));
+    connect(&uiCommon(), &UICommon::sigAskToCommitData,
+            this, &UIVMLogViewerWidget::sltCommitDataSignalReceived);
 }
 
@@ -363 +365 @@
 }
 
-void UIVMLogViewerWidget::setDialogBeingClosed(bool fFlag)
-{
-    m_fDialogBeingClosed = fFlag;
-}
-
 bool UIVMLogViewerWidget::shouldBeMaximized() const
 {
@@ -375 +372 @@
 void UIVMLogViewerWidget::saveOptions()
 {
-    gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
+    if (!m_fCommitDataSignalReceived)
+        gEDataManager->setLogViweverOptions(m_font, m_bWrapLines, m_bShowLineNumbers);
 }
 
 void UIVMLogViewerWidget::savePanelVisibility()
 {
-    if (m_fDialogBeingClosed)
+    if (m_fCommitDataSignalReceived)
         return;
     /* Save a list of currently visible panels: */
@@ -679 +677 @@
     list << pButton->machineId();
     removeLogViewerPages(list);
+}
+
+void UIVMLogViewerWidget::sltCommitDataSignalReceived()
+{
+    m_fCommitDataSignalReceived = true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h ¶

@@ -92 +92 @@
     QFont currentFont() const;
 
-    /** Sets m_fDialogBeingClosed. */
-    void setDialogBeingClosed(bool fFlag);
-
 protected:
 
@@ -144 +141 @@
     void sltCloseMachineLogs();
     void sltTabCloseButtonClick();
+    void sltCommitDataSignalReceived();
 
 private:
@@ -252 +250 @@
     QIToolButton *m_pCornerButton;
     UIMachineListMenu *m_pMachineSelectionMenu;
-    /** This is set to true by the parent dialog. This is necessary not to save
-      * visible panel list during destruction since they are hidden automatically during that. */
-    bool m_fDialogBeingClosed;
+    /** All extra data saves are done dynamically (as an option changes etc.). The this flag is true
+      * we should not try to save anything to extra data anymore. */
+    bool m_fCommitDataSignalReceived;
+
     friend class UIVMLogViewerFilterPanel;
     friend class UIVMLogViewerPanel;