Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 73177)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 73178)
@@ -213,8 +213,8 @@
 
     /* Acquire family ID: */
-    const QString strFamilyId = m_pComboFamily->itemData(iIndex, TypeID).toString();
+    m_strFamilyId = m_pComboFamily->itemData(iIndex, TypeID).toString();
 
     /* Populate combo-box with OS types related to currently selected family id: */
-    foreach (const UIGuestOSType &guiType, m_types.value(strFamilyId))
+    foreach (const UIGuestOSType &guiType, m_types.value(m_strFamilyId))
     {
         /* Skip 64bit OS types if hardware virtualization or long mode is not supported: */
@@ -227,7 +227,7 @@
 
     /* Select the most recently chosen item: */
-    if (m_currentIds.contains(strFamilyId))
-    {
-        const QString strTypeId = m_currentIds.value(strFamilyId);
+    if (m_currentIds.contains(m_strFamilyId))
+    {
+        const QString strTypeId = m_currentIds.value(m_strFamilyId);
         const int iTypeIndex = m_pComboType->findData(strTypeId, TypeID);
         if (iTypeIndex != -1)
@@ -235,5 +235,5 @@
     }
     /* Or select Windows 7 item for Windows family as default: */
-    else if (strFamilyId == "Windows")
+    else if (m_strFamilyId == "Windows")
     {
         QString strDefaultID = "Windows7";
@@ -245,5 +245,5 @@
     }
     /* Or select Oracle Linux item for Linux family as default: */
-    else if (strFamilyId == "Linux")
+    else if (m_strFamilyId == "Linux")
     {
         QString strDefaultID = "Oracle";
@@ -268,12 +268,11 @@
 {
     /* Acquire type/family IDs: */
-    const QString strTypeId = m_pComboType->itemData(iIndex, TypeID).toString();
-    const QString strFamilyId = m_pComboFamily->itemData(m_pComboFamily->currentIndex(), TypeID).toString();
+    m_strTypeId = m_pComboType->itemData(iIndex, TypeID).toString();
 
     /* Update selected type pixmap: */
-    m_pIconType->setPixmap(vboxGlobal().vmGuestOSTypePixmapDefault(strTypeId));
+    m_pIconType->setPixmap(vboxGlobal().vmGuestOSTypePixmapDefault(m_strTypeId));
 
     /* Save the most recently used item: */
-    m_currentIds[strFamilyId] = strTypeId;
+    m_currentIds[m_strFamilyId] = m_strTypeId;
 
     /* Notifies listeners about OS type change: */