github/qBittorrent
1
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2024-10-19 21:36:47 +02:00
Code Releases Activity

Merge pull request #12944 from glassez/hotfix

Browse Source 
Fix invalid assertion
This commit is contained in:
Vladimir Golovnev 2020-05-29 12:20:32 +03:00 committed by GitHub
commit 68d4dc34db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/base/bittorrent/session.cpp
View File

@ -4685,8 +4685,9 @@ void Session::handleTorrentDeletedAlert(const lt::torrent_deleted_alert *p)
if (removingTorrentDataIter == m_removingTorrents.end())
return;
Q_ASSERT(removingTorrentDataIter->pathsToRemove.count() == 1);
Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->pathsToRemove.first());
Q_ASSERT(removingTorrentDataIter->pathsToRemove.count() <= 1);
if (!removingTorrentDataIter->pathsToRemove.isEmpty())
Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->pathsToRemove.first());
LogMsg(tr("'%1' was removed from the transfer list and hard disk.", "'xxx.avi' was removed...").arg(removingTorrentDataIter->name));
m_removingTorrents.erase(removingTorrentDataIter);
}
@ -4701,8 +4702,9 @@ void Session::handleTorrentDeleteFailedAlert(const lt::torrent_delete_failed_ale
// libtorrent won't delete the directory if it contains files not listed in the torrent,
// so we remove the directory ourselves
Q_ASSERT(removingTorrentDataIter->pathsToRemove.count() == 1);
Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->pathsToRemove.first());
Q_ASSERT(removingTorrentDataIter->pathsToRemove.count() <= 1);
if (!removingTorrentDataIter->pathsToRemove.isEmpty())
Utils::Fs::smartRemoveEmptyFolderTree(removingTorrentDataIter->pathsToRemove.first());
if (p->error) {
LogMsg(tr("'%1' was removed from the transfer list but the files couldn't be deleted. Error: %2", "'xxx.avi' was removed...")