From 85e9f8064aec73a5f94813c518d8b6d11689c421 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 28 Aug 2014 12:21:55 -0700
Subject: [PATCH] Simplify to use bool instead of storing domain name

---
 interface/src/Menu.cpp | 14 ++++++--------
 interface/src/Menu.h   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 15a674566b..4dc10fa304 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -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();
 }
 
diff --git a/interface/src/Menu.h b/interface/src/Menu.h
index 8f6724af24..8db118a471 100644
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@@ -304,7 +304,7 @@ private:
     QPointer<AttachmentsDialog> _attachmentsDialog;
     QPointer<AnimationsDialog> _animationsDialog;
     QPointer<LoginDialog> _loginDialog;
-    QString _loginDomain;
+    bool _hasLoginDialogDisplayed;
     QAction* _chatAction;
     QString _snapshotsLocation;
     QString _scriptsLocation;