Changeset 88766 in vbox

Timestamp:

Apr 29, 2021 7:40:19 AM (4 years ago)

Author:

vboxsync

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

144096

Message:

FE/Qt: bugref:8161. In the machine UI context the logviewer saves options to extra data during destruction.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• logviewer/UIVMLogViewerWidget.cpp (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)

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

@@ -164 +164 @@
 }
 
+UIVMLogViewerWidget::~UIVMLogViewerWidget()
+{
+    /* In machine UI context we perform cleanup during destruction.
+       UIMachineLogic makes sure this happens early enough: */
+    if (m_enmEmbedding == EmbedTo_Dialog)
+        sltSaveOptions();
+}
+
 int UIVMLogViewerWidget::defaultLogPageWidth() const
 {
@@ -728 +736 @@
     if (loadedFont != QFont())
         m_font = loadedFont;
-    connect(&uiCommon(), &UICommon::sigAskToCommitData,
-            this, &UIVMLogViewerWidget::sltSaveOptions);
+    /* In manager UI we cleanup by listening the sigAskToCommitData signal: */
+    if (m_enmEmbedding == EmbedTo_Stack)
+        connect(&uiCommon(), &UICommon::sigAskToCommitData,
+                this, &UIVMLogViewerWidget::sltSaveOptions);
 }
 

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

@@ -73 +73 @@
     UIVMLogViewerWidget(EmbedTo enmEmbedding, UIActionPool *pActionPool,
                         bool fShowToolbar = true, const CMachine &comMachine = CMachine(), QWidget *pParent = 0);
+    ~UIVMLogViewerWidget();
     /** Returns the width of the current log page. return 0 if there is no current log page: */
     int defaultLogPageWidth() const;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -2568 +2568 @@
 void UIMachineLogic::sltCloseLogViewerWindow()
 {
-    QIManagerDialog* pDialog = qobject_cast<QIManagerDialog*>(sender());
-    if (m_pLogViewerDialog != pDialog || !pDialog)
-        return;
-
+    if (!m_pLogViewerDialog)
+        return;
+
+    QIManagerDialog* pDialog = m_pLogViewerDialog;
     /* Set the m_pLogViewerDialog to NULL before closing the dialog. or we will have redundant deletes*/
     m_pLogViewerDialog = 0;
@@ -2808 +2808 @@
     cleanupDebugger();
 #endif
+    sltCloseLogViewerWindow();
     sltCloseFileManagerDialog();
     sltCloseVMInformationDialog();