StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr792'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-17 17:22:24 +01:00
commit 565f50e124
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/filetransferinstance.cpp
View File

@ -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())