diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-08 01:27:30 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-08 01:27:30 -0700 |
| commit | 7f138e353801d0dde7608f2900b78cbe48d9488d (patch) | |
| tree | 42d146bd6a4f2a9cf026e106aa3aa1e5aaa95642 /launcher/ui/pages/global/APIPage.cpp | |
| parent | b8b8c8d4acab8c794555956fae699d5706e222f3 (diff) | |
| parent | 3211b265d75dc7e28b1608935396bce2ac4648dd (diff) | |
| download | PrismLauncher-7f138e353801d0dde7608f2900b78cbe48d9488d.tar.gz PrismLauncher-7f138e353801d0dde7608f2900b78cbe48d9488d.tar.bz2 PrismLauncher-7f138e353801d0dde7608f2900b78cbe48d9488d.zip | |
Merge branch 'develop' into ci/address-sanitiser_on_debug_builds
Diffstat (limited to 'launcher/ui/pages/global/APIPage.cpp')
| -rw-r--r-- | launcher/ui/pages/global/APIPage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/launcher/ui/pages/global/APIPage.cpp b/launcher/ui/pages/global/APIPage.cpp index dca1b3a6..668aa007 100644 --- a/launcher/ui/pages/global/APIPage.cpp +++ b/launcher/ui/pages/global/APIPage.cpp @@ -81,6 +81,8 @@ APIPage::APIPage(QWidget *parent) : connect(ui->pasteTypeComboBox, currentIndexChangedSignal, this, &APIPage::updateBaseURLPlaceholder); // This function needs to be called even when the ComboBox's index is still in its default state. updateBaseURLPlaceholder(ui->pasteTypeComboBox->currentIndex()); + // NOTE: this allows http://, but we replace that with https later anyway + ui->metaURL->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->metaURL)); ui->baseURLEntry->setValidator(new QRegularExpressionValidator(validUrlRegExp, ui->baseURLEntry)); ui->msaClientID->setValidator(new QRegularExpressionValidator(validMSAClientID, ui->msaClientID)); ui->flameKey->setValidator(new QRegularExpressionValidator(validFlameKey, ui->flameKey)); @@ -163,7 +165,7 @@ void APIPage::applySettings() QString msaClientID = ui->msaClientID->text(); s->set("MSAClientIDOverride", msaClientID); - QUrl metaURL = ui->metaURL->text(); + QUrl metaURL(ui->metaURL->text()); // Add required trailing slash if (!metaURL.isEmpty() && !metaURL.path().endsWith('/')) { |