Sophie

Sophie

distrib > Mageia > 5 > i586 > media > core-updates-src > by-pkgid > 4fd0c9e747871ea81a73054c841c514e > files > 12

virtualbox-5.0.4-1.mga5.src.rpm

diff -Nurp VirtualBox-5.0.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp VirtualBox-5.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
--- VirtualBox-5.0.2.orig/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2015-08-13 18:37:34.000000000 +0300
+++ VirtualBox-5.0.2/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	2015-08-15 13:56:21.831435681 +0300
@@ -109,6 +109,9 @@
         m_pFamilyCombo->setItemData(i, families[i].GetFamilyId(), TypeID);
     }
     m_pFamilyCombo->setCurrentIndex(0);
+    int liIndex = m_pFamilyCombo->findData("Linux", TypeID);
+    if (liIndex != -1)
+	 m_pFamilyCombo->setCurrentIndex(liIndex);
     sltFamilyChanged(m_pFamilyCombo->currentIndex());
 
     /* Setup connections: */
@@ -198,6 +201,13 @@
         if (iTypeIndex != -1)
             m_pTypeCombo->setCurrentIndex(iTypeIndex);
     }
+    /* Or select Mageia item for Linux family as default: */
+    else if (strFamilyId == "Linux")
+    {
+        int iIndexMageia = m_pTypeCombo->findData("Mageia", TypeID);
+        if (iIndexMageia != -1)
+            m_pTypeCombo->setCurrentIndex(iIndexMageia);
+    }
     /* Or select Windows 7 item for Windows family as default: */
     else if (strFamilyId == "Windows")
     {
@@ -208,16 +218,6 @@
         if (iIndexWin7 != -1)
             m_pTypeCombo->setCurrentIndex(iIndexWin7);
     }
-    /* Or select Ubuntu item for Linux family as default: */
-    else if (strFamilyId == "Linux")
-    {
-        QString strDefaultID = "Ubuntu";
-        if (ARCH_BITS == 64 && m_fSupportsHWVirtEx && m_fSupportsLongMode)
-            strDefaultID += "_64";
-        int iIndexUbuntu = m_pTypeCombo->findData(strDefaultID, TypeID);
-        if (iIndexUbuntu != -1)
-            m_pTypeCombo->setCurrentIndex(iIndexUbuntu);
-    }
     /* Else simply select the first one present: */
     else m_pTypeCombo->setCurrentIndex(0);