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

Timestamp:

May 17, 2021 3:33:21 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930. Repeating r144445 for te file manager

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• guestctrl/UIFileManager.cpp (modified) (1 diff)
• guestctrl/UIFileManager.h (modified) (2 diffs)
• logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -735 +735 @@
 void UIFileManager::hidePanel(UIDialogPanel* panel)
 {
+    if (!m_pActionPool)
+        return;
     if (panel && panel->isVisible())
         panel->setVisible(false);

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

@@ -23 +23 @@
 
 /* Qt includes: */
+#include <QPointer>
 #include <QWidget>
 
@@ -180 +181 @@
     CEventListener m_comGuestListener;
     const EmbedTo  m_enmEmbedding;
-    UIActionPool  *m_pActionPool;
+    QPointer<UIActionPool>  m_pActionPool;
     const bool     m_fShowToolbar;
     QMap<UIDialogPanel*, QAction*> m_panelActionMap;

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

@@ -1047 +1047 @@
 void UIVMLogViewerWidget::hidePanel(UIDialogPanel* panel)
 {
-    if (!panel)
-        return;
-    if (!m_pActionPool)
+    if (!panel || !m_pActionPool)
         return;
     if (panel->isVisible())