From 1e7ceafa5f318da0ec997d8c40b4b97fdc8bc816 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Wed, 26 Mar 2025 23:48:00 +0000 Subject: [PATCH] Auto-fix \ to / on Windows (for portability) Signed-off-by: TheKodeToad --- launcher/ui/widgets/MinecraftSettingsWidget.cpp | 11 +++++++++-- launcher/ui/widgets/MinecraftSettingsWidget.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.cpp b/launcher/ui/widgets/MinecraftSettingsWidget.cpp index f369e393c..df7ed083b 100644 --- a/launcher/ui/widgets/MinecraftSettingsWidget.cpp +++ b/launcher/ui/widgets/MinecraftSettingsWidget.cpp @@ -106,8 +106,7 @@ MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstancePtr instance, if (!value) m_instance->settings()->reset("GlobalDataPacksPath"); }); - connect(m_ui->dataPacksPathEdit, &QLineEdit::editingFinished, this, - [this] { m_instance->settings()->set("GlobalDataPacksPath", m_ui->dataPacksPathEdit->text()); }); + connect(m_ui->dataPacksPathEdit, &QLineEdit::editingFinished, this, &MinecraftSettingsWidget::editedDataPacksPath); connect(m_ui->dataPacksPathBrowse, &QPushButton::clicked, this, &MinecraftSettingsWidget::selectDataPacksFolder); } @@ -478,6 +477,14 @@ bool MinecraftSettingsWidget::isQuickPlaySupported() return m_instance->traits().contains("feature:is_quick_play_singleplayer"); } +void MinecraftSettingsWidget::editedDataPacksPath() +{ + if (QDir::separator() != '/') + m_ui->dataPacksPathEdit->setText(m_ui->dataPacksPathEdit->text().replace(QDir::separator(), '/')); + + m_instance->settings()->set("GlobalDataPacksPath", m_ui->dataPacksPathEdit->text()); +} + void MinecraftSettingsWidget::selectDataPacksFolder() { QString path = QFileDialog::getExistingDirectory(this, tr("Select Global Data Packs Folder"), m_instance->gameRoot()); diff --git a/launcher/ui/widgets/MinecraftSettingsWidget.h b/launcher/ui/widgets/MinecraftSettingsWidget.h index 0f9e35b9c..002cd2d56 100644 --- a/launcher/ui/widgets/MinecraftSettingsWidget.h +++ b/launcher/ui/widgets/MinecraftSettingsWidget.h @@ -56,6 +56,7 @@ class MinecraftSettingsWidget : public QWidget { void openGlobalSettings(); void updateAccountsMenu(const SettingsObject& settings); bool isQuickPlaySupported(); + void editedDataPacksPath(); void selectDataPacksFolder(); MinecraftInstancePtr m_instance;