Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-27 07:47:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #385 from PhenomRetroShare/Fix_RsCollectionFileLoadCall

Browse Source 
Fix RsCollectionFile::load(QString, bool) calls.
This commit is contained in:
Cyril Soler 2016-05-16 10:29:58 -04:00
commit 20648707de
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
View File

@ -535,15 +535,15 @@ void SearchDialog::collOpen()
if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection;
if (collection.load(qinfo.absoluteFilePath(), this)) {
if (collection.load(qinfo.absoluteFilePath())) {
collection.downloadFiles();
return;
}//if (collection.load(this))
}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
}//if (qinfo.exists())
}//if (!rsFiles->FileDetails(
}//if (!item->data(SR_DATA_COL, SR_ROLE_LOCAL).toBool())
}//if (selectedItems.size() != 1)
}
}
}
}
}
}
RsCollectionFile collection;
if (collection.load(this)) {

14
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View File

@ -2170,15 +2170,15 @@ void TransfersDialog::collOpen()
if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection;
if (collection.load(qinfo.absoluteFilePath(), this)) {
if (collection.load(qinfo.absoluteFilePath())) {
collection.downloadFiles();
return;
}//if (collection.load(this))
}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
}//if (qinfo.exists())
}//if (info.downloadStatus == FT_STATE_COMPLETE)
}//if (rsFiles->FileDetails(
}//if (items.size() == 1)
}
}
}
}
}
}
RsCollectionFile collection;
if (collection.load(this)) {

12
retroshare-gui/src/gui/SharedFilesDialog.cpp
View File

@ -726,14 +726,14 @@ void SharedFilesDialog::collOpen()
if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection;
if (collection.load(qinfo.absoluteFilePath(), this)) {
if (collection.load(qinfo.absoluteFilePath())) {
collection.downloadFiles();
return;
}//if (collection.load(this))
}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
}//if (qinfo.exists())
}//if (rsFiles->FileDetails(
}//if(files_info.size() == 1)
}
}
}
}
}
RsCollectionFile collection;
if (collection.load(this)) {