github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-31 03:50:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixed deletion message when deleting from finished list

Browse source 
- Added some more asserts (let's kill all those bugs time)
This commit is contained in:
Christophe Dumez 2007-07-29 15:32:27 +00:00
parent 7f89b30190
commit 57376ae875
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/GUI.cpp
View file

@ -1036,12 +1036,15 @@ void GUI::on_actionDelete_Permanently_triggered(){
foreach(fileHash, hashesToDelete){ foreach(fileHash, hashesToDelete){
// Get the file name & hash // Get the file name & hash
QString fileName; QString fileName;
int row = getRowFromHash(fileHash); int row = -1;
if(inDownloadList){ if(inDownloadList){
row = getRowFromHash(fileHash);
fileName = DLListModel->data(DLListModel->index(row, NAME)).toString(); fileName = DLListModel->data(DLListModel->index(row, NAME)).toString();
}else{ }else{
row = finishedTorrentTab->getRowFromHash(fileHash);
fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(row, F_NAME)).toString(); fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(row, F_NAME)).toString();
} }
Q_ASSERT(row != -1);
// Remove the torrent // Remove the torrent
BTSession->deleteTorrent(fileHash, true); BTSession->deleteTorrent(fileHash, true);
// Delete item from download list // Delete item from download list
@ -1104,12 +1107,15 @@ void GUI::on_actionDelete_triggered(){
foreach(fileHash, hashesToDelete){ foreach(fileHash, hashesToDelete){
// Get the file name & hash // Get the file name & hash
QString fileName; QString fileName;
int row = getRowFromHash(fileHash); int row = -1;
if(inDownloadList){ if(inDownloadList){
row = getRowFromHash(fileHash);
fileName = DLListModel->data(DLListModel->index(row, NAME)).toString(); fileName = DLListModel->data(DLListModel->index(row, NAME)).toString();
}else{ }else{
row = finishedTorrentTab->getRowFromHash(fileHash);
fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(row, F_NAME)).toString(); fileName = finishedTorrentTab->getFinishedListModel()->data(finishedTorrentTab->getFinishedListModel()->index(row, F_NAME)).toString();
} }
Q_ASSERT(row != -1);
// Remove the torrent // Remove the torrent
BTSession->deleteTorrent(fileHash, false); BTSession->deleteTorrent(fileHash, false);
// Delete item from download list // Delete item from download list
@ -1120,7 +1126,7 @@ void GUI::on_actionDelete_triggered(){
} else { } else {
finishedTorrentTab->deleteFromFinishedList(fileHash); finishedTorrentTab->deleteFromFinishedList(fileHash);
} }
// Update info bar // Update info bar
setInfoBar(tr("'%1' was removed.", "'xxx.avi' was removed.").arg(fileName)); setInfoBar(tr("'%1' was removed.", "'xxx.avi' was removed.").arg(fileName));
} }
} }
@ -1239,6 +1245,7 @@ void GUI::showProperties(const QModelIndex &index){
void GUI::updateFileSize(QString hash){ void GUI::updateFileSize(QString hash){
int row = getRowFromHash(hash); int row = getRowFromHash(hash);
Q_ASSERT(row != -1);
DLListModel->setData(DLListModel->index(row, SIZE), QVariant((qlonglong)BTSession->torrentEffectiveSize(hash))); DLListModel->setData(DLListModel->index(row, SIZE), QVariant((qlonglong)BTSession->torrentEffectiveSize(hash)));
} }