d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 15:27:54 +00:00
Code Issues Projects Releases Wiki Activity

- Fixed removing from finished list

Browse Source
This commit is contained in:
Christophe Dumez 2007-07-25 14:01:48 +00:00
parent 2ab7f6f923
commit 3ba3e12f93
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GUI.cpp
View File

@ -332,7 +332,7 @@ void GUI::setInfoBar(QString info, QString color){
} }
void GUI::addFastResumeRejectedAlert(QString name){ void GUI::addFastResumeRejectedAlert(QString name){
setInfoBar(tr("Fast resume data was rejected for torrent %1").arg(name)); setInfoBar(tr("Fast resume data was rejected for torrent %1, checking again...").arg(name));
} }
void GUI::balloonClicked(){ void GUI::balloonClicked(){
@ -612,7 +612,9 @@ void GUI::updateDlList(bool force){
case torrent_status::finished: case torrent_status::finished:
case torrent_status::seeding: case torrent_status::seeding:
qDebug("Warning: this shouldn't happen, no finished torrents in download tab, moving it"); qDebug("Warning: this shouldn't happen, no finished torrents in download tab, moving it");
DLListAccess.unlock();
finishedTorrent(h); finishedTorrent(h);
DLListAccess.lock();
continue; continue;
case torrent_status::checking_files: case torrent_status::checking_files:
case torrent_status::queued_for_checking: case torrent_status::queued_for_checking:
@ -1044,8 +1046,8 @@ void GUI::on_actionDelete_Permanently_triggered(){
fileName = DLListModel->data(DLListModel->index(sortedIndex.second.row(), NAME)).toString(); fileName = DLListModel->data(DLListModel->index(sortedIndex.second.row(), NAME)).toString();
fileHash = DLListModel->data(DLListModel->index(sortedIndex.second.row(), HASH)).toString(); fileHash = DLListModel->data(DLListModel->index(sortedIndex.second.row(), HASH)).toString();
}else{ }else{
fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), NAME)).toString(); fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), F_NAME)).toString();
fileHash = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), HASH)).toString(); fileHash = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), F_HASH)).toString();
} }
// Remove the torrent // Remove the torrent
BTSession->deleteTorrent(fileHash, true); BTSession->deleteTorrent(fileHash, true);
@ -1116,8 +1118,8 @@ void GUI::on_actionDelete_triggered(){
fileName = DLListModel->data(DLListModel->index(sortedIndex.second.row(), NAME)).toString(); fileName = DLListModel->data(DLListModel->index(sortedIndex.second.row(), NAME)).toString();
fileHash = DLListModel->data(DLListModel->index(sortedIndex.second.row(), HASH)).toString(); fileHash = DLListModel->data(DLListModel->index(sortedIndex.second.row(), HASH)).toString();
}else{ }else{
fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), NAME)).toString(); fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), F_NAME)).toString();
fileHash = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), HASH)).toString(); fileHash = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(sortedIndex.second.row(), F_HASH)).toString();
} }
// Remove the torrent // Remove the torrent
BTSession->deleteTorrent(fileHash, false); BTSession->deleteTorrent(fileHash, false);

1
src/bittorrent.cpp
View File

@ -142,6 +142,7 @@ bool bittorrent::isPaused(QString hash) const{
// Delete a torrent from the session, given its hash // Delete a torrent from the session, given its hash
// permanent = true means that the torrent will be removed from the hard-drive too // permanent = true means that the torrent will be removed from the hard-drive too
void bittorrent::deleteTorrent(QString hash, bool permanent){ void bittorrent::deleteTorrent(QString hash, bool permanent){
qDebug("Deleting torrent with hash: %s", (const char*)hash.toUtf8());
torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString()))); torrent_handle h = s->find_torrent(misc::fromString<sha1_hash>((hash.toStdString())));
if(!h.is_valid()){ if(!h.is_valid()){
qDebug("/!\\ Error: Invalid handle"); qDebug("/!\\ Error: Invalid handle");