diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-12-03 19:21:04 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-12-03 19:21:04 +0100 |
| commit | 4bae6fe491c8c92286c4ac9f39e9d4ac846d4f2f (patch) | |
| tree | 2da09958eae5379e8ecb2bd20c8a17e57f5ddf3b /application/pages/global/MultiMCPage.cpp | |
| parent | 95e6f37d3942d4ab681e2f2484f17bbf8489c332 (diff) | |
| download | MultiMC-4bae6fe491c8c92286c4ac9f39e9d4ac846d4f2f.tar MultiMC-4bae6fe491c8c92286c4ac9f39e9d4ac846d4f2f.tar.gz MultiMC-4bae6fe491c8c92286c4ac9f39e9d4ac846d4f2f.tar.lz MultiMC-4bae6fe491c8c92286c4ac9f39e9d4ac846d4f2f.tar.xz MultiMC-4bae6fe491c8c92286c4ac9f39e9d4ac846d4f2f.zip | |
GH-2050 fix cancel button in file browse dialogs filling text fields
Diffstat (limited to 'application/pages/global/MultiMCPage.cpp')
| -rw-r--r-- | application/pages/global/MultiMCPage.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp index d945de94..88c3a3b1 100644 --- a/application/pages/global/MultiMCPage.cpp +++ b/application/pages/global/MultiMCPage.cpp @@ -94,13 +94,12 @@ bool MultiMCPage::apply() void MultiMCPage::on_instDirBrowseBtn_clicked() { - QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"), - ui->instDirTextBox->text()); - QString cooked_dir = FS::NormalizePath(raw_dir); + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Instance Folder"), ui->instDirTextBox->text()); // do not allow current dir - it's dirty. Do not allow dirs that don't exist - if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) + if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) { + QString cooked_dir = FS::NormalizePath(raw_dir); if (FS::checkProblemticPathJava(QDir(cooked_dir))) { QMessageBox warning; @@ -127,25 +126,23 @@ void MultiMCPage::on_instDirBrowseBtn_clicked() void MultiMCPage::on_iconsDirBrowseBtn_clicked() { - QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Folder"), - ui->iconsDirTextBox->text()); - QString cooked_dir = FS::NormalizePath(raw_dir); + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Icons Folder"), ui->iconsDirTextBox->text()); // do not allow current dir - it's dirty. Do not allow dirs that don't exist - if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) + if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) { + QString cooked_dir = FS::NormalizePath(raw_dir); ui->iconsDirTextBox->setText(cooked_dir); } } void MultiMCPage::on_modsDirBrowseBtn_clicked() { - QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), - ui->modsDirTextBox->text()); - QString cooked_dir = FS::NormalizePath(raw_dir); + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), ui->modsDirTextBox->text()); // do not allow current dir - it's dirty. Do not allow dirs that don't exist - if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) + if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) { + QString cooked_dir = FS::NormalizePath(raw_dir); ui->modsDirTextBox->setText(cooked_dir); } } |