diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-29 22:13:42 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-29 22:13:42 +0100 |
| commit | 946d397ccedfe1c116566fce1f86ae4f794e44a4 (patch) | |
| tree | 5b93c6316c5c2cc5721d9bb99deb0f3298880ea5 /gui | |
| parent | e7e03c2b542b1cceda63628dd7ca6fa9c875cfd2 (diff) | |
| download | MultiMC-946d397ccedfe1c116566fce1f86ae4f794e44a4.tar MultiMC-946d397ccedfe1c116566fce1f86ae4f794e44a4.tar.gz MultiMC-946d397ccedfe1c116566fce1f86ae4f794e44a4.tar.lz MultiMC-946d397ccedfe1c116566fce1f86ae4f794e44a4.tar.xz MultiMC-946d397ccedfe1c116566fce1f86ae4f794e44a4.zip | |
Customizable folder browsing is same as for the instance folder. Syste Proxy usage.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/settingsdialog.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index fb204d10..f961a7de 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -67,21 +67,27 @@ void SettingsDialog::on_instDirBrowseBtn_clicked() void SettingsDialog::on_modsDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"), - ui->modsDirTextBox->text()); - if (!dir.isEmpty()) + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Directory"), + ui->modsDirTextBox->text()); + QString cooked_dir = NormalizePath(raw_dir); + + // do not allow current dir - it's dirty. Do not allow dirs that don't exist + if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) { - ui->modsDirTextBox->setText(dir); + ui->modsDirTextBox->setText(cooked_dir); } } void SettingsDialog::on_lwjglDirBrowseBtn_clicked() { - QString dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"), - ui->lwjglDirTextBox->text()); - if (!dir.isEmpty()) + QString raw_dir = QFileDialog::getExistingDirectory(this, tr("LWJGL Directory"), + ui->lwjglDirTextBox->text()); + QString cooked_dir = NormalizePath(raw_dir); + + // do not allow current dir - it's dirty. Do not allow dirs that don't exist + if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) { - ui->lwjglDirTextBox->setText(dir); + ui->lwjglDirTextBox->setText(cooked_dir); } } |