1 files changed, 21 insertions, 2 deletions
diff --git a/src/plugins/General/library/settingsdialog.cpp b/src/plugins/General/library/settingsdialog.cpp
index dd039eaf6..275478bc7 100644
--- a/src/plugins/General/library/settingsdialog.cpp
+++ b/src/plugins/General/library/settingsdialog.cpp
@@ -1,5 +1,8 @@
-#include <QDir>
+#include <qmmp/qmmp.h>
 #include <qmmpui/filedialog.h>
+#include <QDir>
+
+#include <QSettings>
 #include "settingsdialog.h"
 #include "ui_settingsdialog.h"
 
@@ -8,7 +11,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
     m_ui(new Ui::SettingsDialog)
 {
     m_ui->setupUi(this);
-    m_lastPath = QDir::homePath();
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    m_lastPath = settings.value("Library/last_path", QDir::homePath()).toString();
+    QStringList dirs = settings.value("Library/dirs").toStringList();
+    m_ui->dirsListWidget->addItems(dirs);
 }
 
 SettingsDialog::~SettingsDialog()
@@ -16,6 +22,19 @@ SettingsDialog::~SettingsDialog()
     delete m_ui;
 }
 
+void SettingsDialog::accept()
+{
+    QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
+    settings.setValue("Library/last_path", m_lastPath);
+
+    QStringList dirs;
+    for(int i = 0; i < m_ui->dirsListWidget->count(); ++i)
+        dirs << m_ui->dirsListWidget->item(i)->text();
+
+    settings.setValue("Library/dirs", dirs);
+    QDialog::accept();
+}
+
 void SettingsDialog::on_addDirButton_clicked()
 {
     QString path = FileDialog::getExistingDirectory(this, tr("Select Directories for Scanning"), m_lastPath);