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

Merge pull request #2694 from csoler/v0.6-BugFixing_27

Browse Source 
fixed bug preventing completed files removal to clear the files counter
This commit is contained in:
csoler 2023-04-03 22:09:32 +02:00 committed by GitHub
commit e7ff1b15b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/FileTransfer/TransferUserNotify.cpp
View File

@ -27,8 +27,6 @@ TransferUserNotify::TransferUserNotify(QObject *parent) :
UserNotify(parent) UserNotify(parent)
{ {
newTransferCount = 0; newTransferCount = 0;
// connect(NotifyQt::getInstance(), SIGNAL(downloadCompleteCountChanged(int)), this, SLOT(downloadCountChanged(int)));
} }
bool TransferUserNotify::hasSetting(QString *name, QString *group) bool TransferUserNotify::hasSetting(QString *name, QString *group)

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

@ -1111,16 +1111,20 @@ void TransfersDialog::handleEvent_main_thread(std::shared_ptr<const RsEvent> eve
if(!fe) if(!fe)
return; return;
FileInfo nfo ;
if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo))
return ;
switch (fe->mFileTransferEventCode) switch (fe->mFileTransferEventCode)
{ {
case RsFileTransferEventCode::DOWNLOAD_COMPLETE: case RsFileTransferEventCode::DOWNLOAD_COMPLETE:
{
FileInfo nfo ;
if(!rsFiles->FileDetails(fe->mHash, RS_FILE_HINTS_DOWNLOAD, nfo))
break;
SoundManager::play(SOUND_DOWNLOAD_COMPLETE); SoundManager::play(SOUND_DOWNLOAD_COMPLETE);
if (Settings->getNotifyFlags() & RS_POPUP_DOWNLOAD) if (Settings->getNotifyFlags() & RS_POPUP_DOWNLOAD)
NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),""); NotifyQt::getInstance()->addToaster(RS_POPUP_DOWNLOAD, fe->mHash.toStdString(), nfo.fname.c_str(),"");
}
[[fallthrough]];
case RsFileTransferEventCode::COMPLETED_FILES_REMOVED: case RsFileTransferEventCode::COMPLETED_FILES_REMOVED:
getUserNotify()->updateIcon(); getUserNotify()->updateIcon();