mirror of
https://github.com/overte-org/overte.git
synced 2025-04-21 19:04:32 +02:00
Simplify to use bool instead of storing domain name
This commit is contained in:
parent
46c1a9d59a
commit
85e9f8064a
2 changed files with 7 additions and 9 deletions
|
@ -114,7 +114,7 @@ Menu::Menu() :
|
|||
_loginAction(NULL),
|
||||
_preferencesDialog(NULL),
|
||||
_loginDialog(NULL),
|
||||
_loginDomain(),
|
||||
_hasLoginDialogDisplayed(false),
|
||||
_snapshotsLocation(),
|
||||
_scriptsLocation(),
|
||||
_walletPrivateKey()
|
||||
|
@ -1055,23 +1055,21 @@ const float DIALOG_RATIO_OF_WINDOW = 0.30f;
|
|||
|
||||
void Menu::clearLoginDomain() {
|
||||
// Needed for domains that don't require login.
|
||||
_loginDomain = QString();
|
||||
_hasLoginDialogDisplayed = false;
|
||||
}
|
||||
|
||||
void Menu::loginForCurrentDomain() {
|
||||
QString domain = NodeList::getInstance()->getDomainHandler().getHostname();
|
||||
bool hasShownForDomain = domain == _loginDomain;
|
||||
|
||||
if (!_loginDialog && !hasShownForDomain) {
|
||||
_loginDomain = domain;
|
||||
if (!_loginDialog && !_hasLoginDialogDisplayed) {
|
||||
_loginDialog = new LoginDialog(Application::getInstance()->getWindow());
|
||||
_loginDialog->show();
|
||||
_loginDialog->resizeAndPosition(false);
|
||||
}
|
||||
|
||||
_hasLoginDialogDisplayed = true;
|
||||
}
|
||||
|
||||
void Menu::showLoginForCurrentDomain() {
|
||||
_loginDomain = QString();
|
||||
_hasLoginDialogDisplayed = false;
|
||||
loginForCurrentDomain();
|
||||
}
|
||||
|
||||
|
|
|
@ -304,7 +304,7 @@ private:
|
|||
QPointer<AttachmentsDialog> _attachmentsDialog;
|
||||
QPointer<AnimationsDialog> _animationsDialog;
|
||||
QPointer<LoginDialog> _loginDialog;
|
||||
QString _loginDomain;
|
||||
bool _hasLoginDialogDisplayed;
|
||||
QAction* _chatAction;
|
||||
QString _snapshotsLocation;
|
||||
QString _scriptsLocation;
|
||||
|
|
Loading…
Reference in a new issue