Browse Source

Fix browse button in torrent addition dialog.

Was broken by a recent pull request.
adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
f05ecf900a
  1. 26
      src/torrentadditiondlg.cpp

26
src/torrentadditiondlg.cpp

@ -526,20 +526,18 @@ void torrentAdditionDialog::on_browseButton_clicked() {
QString new_path; QString new_path;
QString root_folder; QString root_folder;
const QString label_name = comboLabel->currentText(); const QString label_name = comboLabel->currentText();
if (!m_isMagnet) { if (!m_isMagnet && m_torrentInfo->num_files() == 1) {
if (m_torrentInfo->num_files() == 1) { new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), savePathTxt->currentText(), QString(), 0, QFileDialog::DontConfirmOverwrite);
new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), savePathTxt->currentText(), QString(), 0, QFileDialog::DontConfirmOverwrite); if (!new_path.isEmpty()) {
if (!new_path.isEmpty()) { QStringList path_parts = new_path.replace("\\", "/").split("/");
QStringList path_parts = new_path.replace("\\", "/").split("/"); const QString filename = path_parts.takeLast();
const QString filename = path_parts.takeLast(); // Append label
// Append label if (QDir(path_parts.join(QDir::separator())) == QDir(m_defaultSavePath) && !label_name.isEmpty())
if (QDir(path_parts.join(QDir::separator())) == QDir(m_defaultSavePath) && !label_name.isEmpty()) path_parts << label_name;
path_parts << label_name; // Append file name
// Append file name path_parts << filename;
path_parts << filename; // Construct new_path
// Construct new_path new_path = path_parts.join(QDir::separator());
new_path = path_parts.join(QDir::separator());
}
} }
} else { } else {
QString truncated_path = getCurrentTruncatedSavePath(&root_folder); QString truncated_path = getCurrentTruncatedSavePath(&root_folder);

Loading…
Cancel
Save