Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-31 18:36:24 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
RetroPooh 2018-04-06 12:50:10 +03:00
parent 5775203b69
commit 154f089dd4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -1389,7 +1389,8 @@ static void processList(const QStringList &list, const QString &textSingular, co
case TYPE_FILE: case TYPE_FILE:
{ {
FileInfo fi1; FileInfo fi1;
if(links.size()==1 && rsFiles->alreadyHaveFile(RsFileHash(link.hash().toStdString()), fi1)) if(links.size()==1 && rsFiles->alreadyHaveFile(RsFileHash(link.hash().toStdString()), fi1)
&& !link.name().endsWith(RsCollection::ExtensionString))
{ {
/* fallthrough */ /* fallthrough */
} }
@ -1475,14 +1476,14 @@ static void processList(const QStringList &list, const QString &textSingular, co
} else if (ret == QMessageBox::NoToAll) { } else if (ret == QMessageBox::NoToAll) {
dontOpenNextFile = true; dontOpenNextFile = true;
} }
needNotifySuccess = false;
} }
} }
if (rsFiles->FileRequest(cleanname.toUtf8().constData(), RsFileHash(link.hash().toStdString()), link.size(), "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds)) { if (rsFiles->FileRequest(cleanname.toUtf8().constData(), RsFileHash(link.hash().toStdString()), link.size(), "", RS_FILE_REQ_ANONYMOUS_ROUTING, srcIds)) {
fileAdded.append(link.name()); fileAdded.append(link.name());
} else { } else {
if (!bFileOpened) fileExist.append(link.name()); if (!bFileOpened && links.size()>1) fileExist.append(link.name());}
}
} }
break; break;
@ -1780,6 +1781,8 @@ static void processList(const QStringList &list, const QString &textSingular, co
QString result; QString result;
if (flag & (RSLINK_PROCESS_NOTIFY_SUCCESS | RSLINK_PROCESS_NOTIFY_ERROR)) { if (flag & (RSLINK_PROCESS_NOTIFY_SUCCESS | RSLINK_PROCESS_NOTIFY_ERROR)) {
result += (links.count() == 1 ? QObject::tr("%1 of %2 RetroShare link processed.") : QObject::tr("%1 of %2 RetroShare links processed.")).arg(countProcessed).arg(links.count()) + "<br><br>"; result += (links.count() == 1 ? QObject::tr("%1 of %2 RetroShare link processed.") : QObject::tr("%1 of %2 RetroShare links processed.")).arg(countProcessed).arg(links.count()) + "<br><br>";
} }