Browse Source

Fix saving to drive root on Windows

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
bc87c1c409
  1. 3
      src/bittorrent.cpp
  2. 5
      src/torrentadditiondlg.cpp

3
src/bittorrent.cpp

@ -2490,7 +2490,10 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
qDebug("getSavePath, got save_path from persistent data: %s", qPrintable(savePath)); qDebug("getSavePath, got save_path from persistent data: %s", qPrintable(savePath));
} }
// Clean path // Clean path
savePath = savePath.replace("\\", "/");
savePath = misc::expandPath(savePath); savePath = misc::expandPath(savePath);
if(!savePath.endsWith("/"))
savePath += "/";
return savePath; return savePath;
} }

5
src/torrentadditiondlg.cpp

@ -513,6 +513,7 @@ void torrentAdditionDialog::renameSelectedFile() {
save_path = save_path.replace("\\", "/"); save_path = save_path.replace("\\", "/");
#endif #endif
save_path = misc::expandPath(save_path); save_path = misc::expandPath(save_path);
qDebug("Save path is %s", qPrintable(save_path));
if(!is_magnet && t->num_files() == 1) { if(!is_magnet && t->num_files() == 1) {
// Remove file name // Remove file name
QStringList parts = save_path.split("/"); QStringList parts = save_path.split("/");
@ -521,6 +522,7 @@ void torrentAdditionDialog::renameSelectedFile() {
files_path << single_file_name; files_path << single_file_name;
save_path = parts.join("/"); save_path = parts.join("/");
} }
qDebug("Save path dir is %s", qPrintable(save_path));
QDir savePath(save_path); QDir savePath(save_path);
const QString current_label = comboLabel->currentText().trimmed(); const QString current_label = comboLabel->currentText().trimmed();
if (!current_label.isEmpty() && !misc::isValidFileSystemName(current_label)) { if (!current_label.isEmpty() && !misc::isValidFileSystemName(current_label)) {
@ -528,7 +530,8 @@ void torrentAdditionDialog::renameSelectedFile() {
return; return;
} }
// Save savepath // Save savepath
TorrentTempData::setSavePath(hash, savePath.path()); qDebug("Saving save path to temp data: %s", qPrintable(savePath.absolutePath()));
TorrentTempData::setSavePath(hash, savePath.absolutePath());
qDebug("Torrent label is: %s", qPrintable(comboLabel->currentText().trimmed())); qDebug("Torrent label is: %s", qPrintable(comboLabel->currentText().trimmed()));
if(!current_label.isEmpty()) if(!current_label.isEmpty())
TorrentTempData::setLabel(hash, current_label); TorrentTempData::setLabel(hash, current_label);

Loading…
Cancel
Save