Merge branch 'pr792'

11 years ago · 565f50e124
1 changed files with 1 additions and 1 deletions
--- a/src/filetransferinstance.cpp
+++ b/src/filetransferinstance.cpp
@ -212,7 +212,7 @@ void FileTransferInstance::acceptRecvRequest()
				@@ -212,7 +212,7 @@ void FileTransferInstance::acceptRecvRequest()
 {
    QString path = Settings::getInstance().getAutoAcceptDir(FriendList::findFriend(friendId)->getToxID());
    
-    if (path.isEmpty())
+    if (path.isEmpty() && Settings::getInstance().getAutoSaveEnabled())
        path = Settings::getInstance().getGlobalAutoAcceptDir();
    
    if (!path.isEmpty())