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

Timestamp:

Feb 17, 2022 10:20:39 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: Checking pointer before creating the connection.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp

@@ -285 +285 @@
 {
     AssertReturnVoid(m_pEditionSelector && names.size() == ids.size());
-
     m_pEditionSelector->clear();
-
     for (int i = 0; i < names.size(); ++i)
         m_pEditionSelector->addItem(names[i], QVariant::fromValue(ids[i]) /* user data */);
@@ -501 +499 @@
                 m_pMainLayout->addWidget(m_pNameLineEdit, iRow, 1, 1, 2);
             }
-
             ++iRow;
         }
@@ -527 +524 @@
                 m_pMainLayout->addWidget(m_pPathSelector, iRow, 1, 1, 2);
             }
-
             ++iRow;
         }
@@ -539 +535 @@
                 m_pImageLabel->setAlignment(Qt::AlignRight);
                 m_pImageLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-
                 m_pMainLayout->addWidget(m_pImageLabel, iRow, 0);
             }
@@ -552 +547 @@
                 m_pImageSelector->setInitialPath(uiCommon().defaultFolderPathForType(UIMediumDeviceType_DVD));
                 m_pImageSelector->setRecentMediaListType(UIMediumDeviceType_DVD);
-
                 m_pMainLayout->addWidget(m_pImageSelector, iRow, 1, 1, 2);
             }
-
             ++iRow;
         }
-
 
         if (m_fChooseEdition)
@@ -576 +568 @@
             {
                 m_pEditionLabel->setBuddy(m_pEditionSelector->focusProxy());
-
                 m_pMainLayout->addWidget(m_pEditionSelector, iRow, 1, 1, 2);
             }
-
             ++iRow;
         }
-
 
         if (m_fChooseType)
@@ -713 +702 @@
         connect(m_pImageSelector, &UIFilePathSelector::pathChanged,
                 this, &UINameAndSystemEditor::sigImageChanged);
-    connect(m_pEditionSelector, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
-            this, &UINameAndSystemEditor::sltSelectedEditionsChanged);
+    if (m_pEditionSelector)
+        connect(m_pEditionSelector, static_cast<void(QIComboBox::*)(int)>(&QIComboBox::currentIndexChanged),
+                this, &UINameAndSystemEditor::sltSelectedEditionsChanged);
 }