=== modified file 'mixxx/src/dlgprefrecord.cpp'
--- mixxx/src/dlgprefrecord.cpp	2012-05-09 17:29:54 +0000
+++ mixxx/src/dlgprefrecord.cpp	2012-06-09 21:26:47 +0000
@@ -48,8 +48,11 @@
     if (recordingsPath == "") {
         // Initialize recordings path in config to old default path.
         // Do it here so we show current value in UI correctly.
-        QDir musicDir(config->getValueString(ConfigKey("[Playlist]","Directory")));
-        QDir recordDir(musicDir.absolutePath() + "/Mixxx/Recordings");
+        QString musicDir = config->getValueString(ConfigKey("[Playlist]","Directory"));
+        if (musicDir.isEmpty()) {
+            musicDir = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
+        }
+        QDir recordDir(musicDir + "/Mixxx/Recordings");
         recordingsPath = recordDir.absolutePath();
     }
     LineEditRecordings->setText(recordingsPath);
@@ -241,13 +244,6 @@
 {
     // Recordings path
     QString recordingsPath = config->getValueString(ConfigKey("[Recording]","Directory"));
-    if (recordingsPath == "") {
-        // Initialize recordings path in config to old default path.
-        // Do it here so we show current value in UI correctly.
-        QDir musicDir(config->getValueString(ConfigKey("[Playlist]","Directory")));
-        QDir recordDir(musicDir.absolutePath() + "/Mixxx/Recordings");
-        recordingsPath = recordDir.absolutePath();
-    }
     LineEditRecordings->setText(recordingsPath);
 
     if (radioWav && radioWav->isChecked())
@@ -306,9 +302,9 @@
 
 void DlgPrefRecord::slotEnableCueFile(int enabled)
 {
-    config->set(ConfigKey(RECORDING_PREF_KEY, "CueEnabled"), ConfigValue(CheckBoxRecordCueFile->isChecked()));
+    config->set(ConfigKey(RECORDING_PREF_KEY, "CueEnabled"), ConfigValue(enabled != Qt::Unchecked));
+}
 
-}
 void DlgPrefRecord::slotChangeSplitSize()
 {
         config->set(ConfigKey(RECORDING_PREF_KEY, "FileSize"),

=== modified file 'mixxx/src/recording/recordingmanager.cpp'
--- mixxx/src/recording/recordingmanager.cpp	2012-05-20 10:32:09 +0000
+++ mixxx/src/recording/recordingmanager.cpp	2012-06-09 21:26:06 +0000
@@ -100,29 +100,15 @@
 }
 
 void RecordingManager::setRecordingDir() {
-    QString userRecordings = m_pConfig->getValueString(
-        ConfigKey("[Recording]", "Directory"));
-
-    QDir recordDir;
-    if (userRecordings == "") {
-        qDebug() << "Recording directory was not set";
-        // Create recordings directory under music library path by default
-        QDir musicDir(m_pConfig->getValueString(ConfigKey("[Playlist]", "Directory")));
-        userRecordings = musicDir.absolutePath()+"/Mixxx/Recordings";
-        recordDir.setPath(userRecordings);
-
-        // Save default preference value
-        m_pConfig->set(ConfigKey("[Recording]", "Directory"),
-                       recordDir.absolutePath());
-    } else {
-        recordDir.setPath(userRecordings);
-    }
+    QDir recordDir(m_pConfig->getValueString(
+        ConfigKey("[Recording]", "Directory")));
+    // Note: the default ConfigKey for recordDir is set in DlgPrefRecord::DlgPrefRecord
 
     if (!recordDir.exists()) {
         if (recordDir.mkpath(recordDir.absolutePath())) {
-            qDebug() << "Created folder" << userRecordings << "for recordings";
+            qDebug() << "Created folder" << recordDir.absolutePath() << "for recordings";
         } else {
-            qDebug() << "Failed to create folder" << userRecordings << "for recordings";
+            qDebug() << "Failed to create folder" << recordDir.absolutePath() << "for recordings";
         }
     }
     m_recordingDir = recordDir.absolutePath();