From 8dfe81f5228111ab76f6af7d789f1966faa46341 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Wed, 29 Jan 2025 20:17:06 +0100 Subject: [PATCH] Display failure if Twitch token account name cannot be fetched --- plugins/twitch/token.cpp | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/plugins/twitch/token.cpp b/plugins/twitch/token.cpp index 172e4b0a..7f1a0151 100644 --- a/plugins/twitch/token.cpp +++ b/plugins/twitch/token.cpp @@ -681,22 +681,33 @@ void TwitchTokenSettingsDialog::RequestToken() void TwitchTokenSettingsDialog::GotToken(const std::optional &value) { _currentTokenValue->setText(value.value_or("")); - if (value.has_value()) { - _tokenStatus->setText(obs_module_text( - "AdvSceneSwitcher.twitchToken.request.success")); - _currentToken.SetToken(value.value().toStdString()); - auto name = QString::fromStdString(_currentToken._name); - _name->setText(name); - _name->textEdited(name); - QMetaObject::invokeMethod(this, "NameChanged", - Q_ARG(const QString &, name)); - SetTokenInfoVisible(true); - } else { + if (!value) { _tokenStatus->setText(obs_module_text( "AdvSceneSwitcher.twitchToken.request.fail")); _name->setText(""); SetTokenInfoVisible(false); + _requestToken->setEnabled(true); + return; } + + _currentToken.SetToken(value.value().toStdString()); + auto name = QString::fromStdString(_currentToken._name); + if (name.isEmpty()) { + _tokenStatus->setText(obs_module_text( + "AdvSceneSwitcher.twitchToken.request.fail")); + _name->setText(""); + SetTokenInfoVisible(false); + _requestToken->setEnabled(true); + return; + } + + _tokenStatus->setText(obs_module_text( + "AdvSceneSwitcher.twitchToken.request.success")); + _name->setText(name); + _name->textEdited(name); + QMetaObject::invokeMethod(this, "NameChanged", + Q_ARG(const QString &, name)); + SetTokenInfoVisible(true); _requestToken->setEnabled(true); }