Browse Source

- Do not save torrent related info in class destruction, this is too dangerous

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
fd2ee35e92
  1. 3
      src/GUI.cpp
  2. 21
      src/bittorrent.cpp

3
src/GUI.cpp

@ -503,6 +503,9 @@ void GUI::closeEvent(QCloseEvent *e) {
} }
// Save window size, columns size // Save window size, columns size
writeSettings(); writeSettings();
// Do some BT related saving
BTSession->saveDHTEntry();
BTSession->saveFastResumeAndRatioData();
// Accept exit // Accept exit
e->accept(); e->accept();
qApp->exit(); qApp->exit();

21
src/bittorrent.cpp

@ -85,9 +85,6 @@ bittorrent::~bittorrent() {
delete timerAlerts; delete timerAlerts;
delete ETARefresher; delete ETARefresher;
delete downloader; delete downloader;
// Do some saving
saveDHTEntry();
saveFastResumeAndRatioData();
// Delete BT session // Delete BT session
delete s; delete s;
} }
@ -383,15 +380,15 @@ void bittorrent::addTorrent(QString path, bool fromScanDir, QString from_url) {
QString old_hash = fi.baseName(); QString old_hash = fi.baseName();
if(old_hash != hash){ if(old_hash != hash){
qDebug("* ERROR: Strange, hash changed from %s to %s", old_hash.toUtf8().data(), hash.toUtf8().data()); qDebug("* ERROR: Strange, hash changed from %s to %s", old_hash.toUtf8().data(), hash.toUtf8().data());
QStringList filters; // QStringList filters;
filters << old_hash+".*"; // filters << old_hash+".*";
QStringList files = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted); // QStringList files = torrentBackup.entryList(filters, QDir::Files, QDir::Unsorted);
QString my_f; // QString my_f;
foreach(my_f, files) { // foreach(my_f, files) {
qDebug("* deleting %s", my_f.toUtf8().data()); // qDebug("* deleting %s", my_f.toUtf8().data());
torrentBackup.remove(my_f); // torrentBackup.remove(my_f);
} // }
return; // return;
} }
} }
if(s->find_torrent(t.info_hash()).is_valid()) { if(s->find_torrent(t.info_hash()).is_valid()) {

Loading…
Cancel
Save