Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h	(revision 76057)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h	(revision 76058)
@@ -261,6 +261,5 @@
 template<> SHARED_LIBRARY_STUFF UIMediumFormat fromInternalString<UIMediumFormat>(const QString &strUIMediumFormat);
 template<> SHARED_LIBRARY_STUFF QString toString(const UISettingsDefs::RecordingMode &enmRecordingMode);
-template<> SHARED_LIBRARY_STUFF QString toInternalString(const UISettingsDefs::RecordingMode &enmRecordingMode);
-template<> SHARED_LIBRARY_STUFF UISettingsDefs::RecordingMode fromInternalString<UISettingsDefs::RecordingMode>(const QString &enmRecordingMode);
+template<> SHARED_LIBRARY_STUFF UISettingsDefs::RecordingMode fromString<UISettingsDefs::RecordingMode>(const QString &enmRecordingMode);
 
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 76057)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 76058)
@@ -2522,24 +2522,6 @@
 }
 
-/* QString <= UISettingsDefs::RecordingMode: */
-template<> QString toInternalString(const UISettingsDefs::RecordingMode &enmRecordingMode)
-{
-    QString strResult;
-    switch (enmRecordingMode)
-    {
-        case UISettingsDefs::RecordingMode_VideoAudio: strResult = "Video/Audio"; break;
-        case UISettingsDefs::RecordingMode_VideoOnly:  strResult = "VideoOnly";   break;
-        case UISettingsDefs::RecordingMode_AudioOnly:  strResult = "AudioOnly";   break;
-        default:
-        {
-            AssertMsgFailed(("No text for recording mode=%d", enmRecordingMode));
-            break;
-        }
-    }
-    return strResult;
-}
-
 /* UISettingsDefs::RecordingMode <= QString: */
-template<> UISettingsDefs::RecordingMode fromInternalString<UISettingsDefs::RecordingMode>(const QString &strRecordingMode)
+template<> UISettingsDefs::RecordingMode fromString<UISettingsDefs::RecordingMode>(const QString &strRecordingMode)
 {
     /* Here we have some fancy stuff allowing us
@@ -2547,7 +2529,7 @@
     QStringList keys;       QList<UISettingsDefs::RecordingMode> values;
     keys << "Video/Audio";  values << UISettingsDefs::RecordingMode_VideoAudio;
-    keys << "VideoOnly";    values << UISettingsDefs::RecordingMode_VideoOnly;
-    keys << "AudioOnly";    values << UISettingsDefs::RecordingMode_AudioOnly;
-    /* VDI format for unknown words: */
+    keys << "Video Only";    values << UISettingsDefs::RecordingMode_VideoOnly;
+    keys << "Audio Only";    values << UISettingsDefs::RecordingMode_AudioOnly;
+    /* Video/Audio for unknown words: */
     if (!keys.contains(strRecordingMode, Qt::CaseInsensitive))
         return UISettingsDefs::RecordingMode_VideoAudio;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 76057)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 76058)
@@ -511,9 +511,14 @@
 
     /* Update recording options */
+    UISettingsDefs::RecordingMode enmRecordingMode =
+        gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
     QStringList optionValues;
-    optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_VideoAudio) ||
-                            m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_VideoOnly)) ? "true" : "false");
-    optionValues.push_back((m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_VideoAudio) ||
-                            m_pComboBoxCaptureMode->currentIndex() == static_cast<int>(UISettingsDefs::RecordingMode_AudioOnly)) ? "true" : "false");
+    /* Option value for video recording: */
+    optionValues.push_back((enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio) ||
+                           (enmRecordingMode == UISettingsDefs::RecordingMode_VideoOnly) ? "true" : "false");
+    /* Option value for audio recording: */
+    optionValues.push_back((enmRecordingMode == UISettingsDefs::RecordingMode_VideoAudio) ||
+                           (enmRecordingMode == UISettingsDefs::RecordingMode_AudioOnly) ? "true" : "false");
+
     if (m_pSliderAudioCaptureQuality->value() == 1)
         optionValues.push_back("low");
@@ -1727,6 +1732,6 @@
                                              (isMachineOnline() && !m_pCache->base().m_fRecordingEnabled && m_pCheckboxVideoCapture->isChecked());
 
-    const UISettingsDefs::RecordingMode enmRecordingMode =
-        static_cast<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentIndex());
+    UISettingsDefs::RecordingMode enmRecordingMode =
+        gpConverter->fromString<UISettingsDefs::RecordingMode>(m_pComboBoxCaptureMode->currentText());
 
     /* Video Capture Screens option should be enabled only if:
