From bd222ac8bd8cc41fd840619542aab20d5cb70560 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Tue, 22 Dec 2009 19:22:33 +0000
Subject: [PATCH] - BUGFIX: Use the save path set in program preferences as a
 default in torrent addition dialog

---
 Changelog                |  3 ++-
 src/torrentadditiondlg.h | 13 +++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Changelog b/Changelog
index b20e5f835..ec3d11228 100644
--- a/Changelog
+++ b/Changelog
@@ -3,7 +3,8 @@
     - BUGFIX: Fix "Temp path" button in program preferences
     - BUGFIX: Handle paths with [~, ., ..] properly
     - BUGFIX: Trackers are now displayed for torrents without metadata
-    - BUGFIX: Fix issue with speed limiting (value should be -1 not 0)
+    - BUGFIX: Fix issue with speed limiting (unlimited was not handled properly)
+    - BUGFIX: Use the save path set in program preferences as a default in torrent addition dialog
 
 * Fri Dec 18 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.2
     - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusuable for new users)
diff --git a/src/torrentadditiondlg.h b/src/torrentadditiondlg.h
index 0abc5f461..eaea0edba 100644
--- a/src/torrentadditiondlg.h
+++ b/src/torrentadditiondlg.h
@@ -50,6 +50,7 @@
 #include "ui_torrentadditiondlg.h"
 #include "torrentpersistentdata.h"
 #include "torrentfilesmodel.h"
+#include "preferences.h"
 
 using namespace libtorrent;
 
@@ -89,13 +90,8 @@ public:
     // Remember columns width
     readSettings();
     //torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch);
-    QString home = QDir::homePath();
-    if(home[home.length()-1] != QDir::separator()){
-      home += QDir::separator();
-    }
-    QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    savePathTxt->setText(settings.value(QString::fromUtf8("LastDirTorrentAdd"), home+QString::fromUtf8("qBT_dir")).toString());
-    if(settings.value("Preferences/Downloads/StartInPause", false).toBool()) {
+    savePathTxt->setText(Preferences::getSavePath());
+    if(Preferences::addTorrentsInPause()) {
       addInPause->setChecked(true);
       addInPause->setEnabled(false);
     }
@@ -320,9 +316,6 @@ public slots:
     }
     // Save savepath
     TorrentTempData::setSavePath(hash, savePath.path());
-    // Save last dir to remember it
-    QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    settings.setValue(QString::fromUtf8("LastDirTorrentAdd"), savePathTxt->text());
     // Create .incremental file if necessary
     TorrentTempData::setSequential(hash, checkIncrementalDL->isChecked());
 #ifdef LIBTORRENT_0_15