From ad01e1d6085a97681537fe3328955dd1660dae36 Mon Sep 17 00:00:00 2001 From: LostDragonist Date: Sat, 10 Nov 2018 22:04:12 -0600 Subject: Less strict implementation of path normalization --- src/settingsdialog.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/settingsdialog.cpp') diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp index 91ce0e25..31c1d0fe 100644 --- a/src/settingsdialog.cpp +++ b/src/settingsdialog.cpp @@ -361,18 +361,15 @@ void SettingsDialog::on_clearCacheButton_clicked() void SettingsDialog::normalizePath(QLineEdit *lineEdit) { QString text = lineEdit->text(); - QString new_text = text; - if (text.contains("%BASE_DIR%")) { - QString baseDir = ui->baseDirEdit->text(); - new_text = new_text.replace("%BASE_DIR%", baseDir); - new_text = QDir(new_text).absolutePath(); - new_text = new_text.replace(baseDir, "%BASE_DIR%"); - } else { - new_text = QDir(new_text).absolutePath(); - } - if (new_text.compare(text, Qt::CaseInsensitive)) { - lineEdit->setText(new_text); + while (text.endsWith('/') || text.endsWith('\\')) { + text.chop(1); } + lineEdit->setText(text); +} + +void SettingsDialog::on_baseDirEdit_editingFinished() +{ + normalizePath(ui->baseDirEdit); } void SettingsDialog::on_downloadDirEdit_editingFinished() -- cgit v1.3.1