squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-21 16:07:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible crash when deleting a torrent without metadata

Browse Source
This commit is contained in:
Christophe Dumez
2010-10-28 16:50:45 +00:00
parent 7d6df2a3c2
commit bee507cb45
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/qtlibtorrent/qbtsession.cpp
View File

@@ -765,15 +765,24 @@ void QBtSession::deleteTorrent(QString hash, bool delete_local_files) {
qDebug("/!\\ Error: Invalid handle"); qDebug("/!\\ Error: Invalid handle");
return; return;
} }
const QString fileName(h.name()); qDebug("h is valid, getting name or hash...");
QString fileName;
if(h.has_metadata())
fileName = h.name();
else
fileName = h.hash();
// Remove it from session // Remove it from session
if(delete_local_files) { if(delete_local_files) {
QDir save_dir(h.save_path()); if(h.has_metadata()) {
if(save_dir != QDir(defaultSavePath) && (defaultTempPath.isEmpty() || save_dir != QDir(defaultTempPath))) QDir save_dir(h.save_path());
savePathsToRemove[hash] = save_dir.absolutePath(); if(save_dir != QDir(defaultSavePath) && (defaultTempPath.isEmpty() || save_dir != QDir(defaultTempPath)))
savePathsToRemove[hash] = save_dir.absolutePath();
}
s->remove_torrent(h, session::delete_files); s->remove_torrent(h, session::delete_files);
} else { } else {
QStringList uneeded_files = h.uneeded_files_path(); QStringList uneeded_files;
if(h.has_metadata())
uneeded_files = h.uneeded_files_path();
s->remove_torrent(h); s->remove_torrent(h);
// Remove unneeded files // Remove unneeded files
foreach(const QString &uneeded_file, uneeded_files) { foreach(const QString &uneeded_file, uneeded_files) {
@@ -796,7 +805,9 @@ void QBtSession::deleteTorrent(QString hash, bool delete_local_files) {
addConsoleMessage(tr("'%1' was removed from transfer list and hard disk.", "'xxx.avi' was removed...").arg(fileName)); addConsoleMessage(tr("'%1' was removed from transfer list and hard disk.", "'xxx.avi' was removed...").arg(fileName));
else else
addConsoleMessage(tr("'%1' was removed from transfer list.", "'xxx.avi' was removed...").arg(fileName)); addConsoleMessage(tr("'%1' was removed from transfer list.", "'xxx.avi' was removed...").arg(fileName));
qDebug("Torrent deleted.");
emit deletedTorrent(hash); emit deletedTorrent(hash);
qDebug("Deleted signal emitted.");
} }
void QBtSession::pauseAllTorrents() { void QBtSession::pauseAllTorrents() {