Merge pull request #6140 from Chocobo1/relocateNoRemove

After files relocate, don't remove the old folder even if it is empty
This commit is contained in:
sledgehammer999 2017-01-19 15:52:09 +02:00 committed by GitHub
commit fed325a54d
2 changed files with 12 additions and 20 deletions

View file

@ -249,18 +249,17 @@ void TransferListWidget::setSelectedTorrentsLocation()
const QList<BitTorrent::TorrentHandle *> torrents = getSelectedTorrents();
if (torrents.isEmpty()) return;
QString dir;
const QDir saveDir(torrents[0]->savePath());
qDebug("Old save path is %s", qPrintable(saveDir.absolutePath()));
dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath(),
const QString oldLocation = torrents[0]->savePath();
qDebug("Old location is %s", qPrintable(oldLocation));
const QString newLocation = QFileDialog::getExistingDirectory(this, tr("Choose save path"), oldLocation,
QFileDialog::DontConfirmOverwrite | QFileDialog::ShowDirsOnly | QFileDialog::HideNameFilterDetails);
if (!dir.isNull()) {
qDebug("New path is %s", qPrintable(dir));
foreach (BitTorrent::TorrentHandle *const torrent, torrents) {
// Actually move storage
torrent->move(Utils::Fs::expandPathAbs(dir));
}
}
if (!QDir(newLocation).exists()) return;
qDebug("New location is %s", qPrintable(newLocation));
// Actually move storage
foreach (BitTorrent::TorrentHandle *const torrent, torrents)
torrent->move(Utils::Fs::expandPathAbs(newLocation));
}
void TransferListWidget::pauseAllTorrents()