From 3349093908f4791b1a393fd80219d15d60fcb2f5 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 7 Apr 2016 19:11:18 -0700
Subject: [PATCH] Fix vr menu login item update

---
 interface/src/ui/LoginDialog.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp
index 196ba5d29e..60d19df355 100644
--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@@ -34,16 +34,19 @@ void LoginDialog::toggleAction() {
     AccountManager& accountManager = AccountManager::getInstance();
     QAction* loginAction = Menu::getInstance()->getActionForOption(MenuOption::Login);
     Q_CHECK_PTR(loginAction);
-    disconnect(loginAction, 0, 0, 0);
+    static QMetaObject::Connection connection;
+    if (connection) {
+        disconnect(connection);
+    }
 
     if (accountManager.isLoggedIn()) {
         // change the menu item to logout
         loginAction->setText("Logout " + accountManager.getAccountInfo().getUsername());
-        connect(loginAction, &QAction::triggered, &accountManager, &AccountManager::logout);
+        connection = connect(loginAction, &QAction::triggered, &accountManager, &AccountManager::logout);
     } else {
         // change the menu item to login
         loginAction->setText("Login");
-        connect(loginAction, &QAction::triggered, [] {
+        connection = connect(loginAction, &QAction::triggered, [] {
             LoginDialog::show();
         });
     }