diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-08 00:14:05 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-07-08 00:14:05 +0300 |
| commit | bc2940e16a8a7839a120a45be9232b5adebbe751 (patch) | |
| tree | 5952ce6503d0a084b7b44c16441caf56999ce303 /launcher/ui/pages/global | |
| parent | cf2393a50966f8dc84720f7d44538b0cb7649d46 (diff) | |
| parent | 1131038fdb0093ef9c732b18d699b6176fc6d82c (diff) | |
| download | PrismLauncher-bc2940e16a8a7839a120a45be9232b5adebbe751.tar.gz PrismLauncher-bc2940e16a8a7839a120a45be9232b5adebbe751.tar.bz2 PrismLauncher-bc2940e16a8a7839a120a45be9232b5adebbe751.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into settings
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/ui/pages/global')
| -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('/')) { |