From 92574458d02d263becd1e3b2a48550e25937f428 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Wed, 20 Jan 2010 18:53:11 +0000
Subject: [PATCH] "Add in pause" setting is no longer ignored if torrent is
 loaded from a watched directory

---
 src/bittorrent.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 6fbaa2a48..48e386fb7 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -853,7 +853,7 @@ QTorrentHandle Bittorrent::addMagnetUri(QString magnet_uri, bool resumed) {
       TorrentPersistentData::saveSavePath(hash, savePath);
     }
   }
-  if(!fastResume && (!addInPause || Preferences::useAdditionDialog())) {
+  if(!fastResume && (!addInPause || (Preferences::useAdditionDialog()))) {
     // Start torrent because it was added in paused state
     h.resume();
   }
@@ -1056,7 +1056,7 @@ QTorrentHandle Bittorrent::addTorrent(QString path, bool fromScanDir, QString fr
     // Copy it to torrentBackup directory
     QFile::copy(file, newFile);
   }
-  if(!fastResume && (!addInPause || Preferences::useAdditionDialog())) {
+  if(!fastResume && (!addInPause || (Preferences::useAdditionDialog() && !fromScanDir))) {
     // Start torrent because it was added in paused state
     h.resume();
   }