Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 06:17:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sending user to saved address if logged in

Browse source
This commit is contained in:
Wayne Chen 2018-11-06 13:32:31 -08:00
parent 9beedf9292
commit c8071e81b1
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -59,6 +59,7 @@ Item {
running: false; running: false;
repeat: false; repeat: false;
onTriggered: { onTriggered: {
loginDialog.dismissLoginDialog();
root.tryDestroy(); root.tryDestroy();
} }
} }
@ -102,7 +103,6 @@ Item {
loggingInText.text = "You are now logged in!"; loggingInText.text = "You are now logged in!";
} }
successTimer.start(); successTimer.start();
loginDialog.dismissLoginDialog();
} }
Item { Item {

10
interface/src/Application.cpp
View file

@ -5231,13 +5231,9 @@ void Application::pauseUntilLoginDetermined() {
nodeList->getDomainHandler().disconnect(); nodeList->getDomainHandler().disconnect();
auto menu = Menu::getInstance(); auto menu = Menu::getInstance();
menu->getMenu("Edit")->setVisible(false); menu->getMenu("Edit")->setVisible(false);
menu->getMenu("Edit")->setEnabled(false);
menu->getMenu("View")->setVisible(false); menu->getMenu("View")->setVisible(false);
menu->getMenu("View")->setEnabled(false);
menu->getMenu("Navigate")->setVisible(false); menu->getMenu("Navigate")->setVisible(false);
menu->getMenu("Navigate")->setEnabled(false);
menu->getMenu("Settings")->setVisible(false); menu->getMenu("Settings")->setVisible(false);
menu->getMenu("Settings")->setEnabled(false);
} }
void Application::resumeAfterLoginDialogActionTaken() { void Application::resumeAfterLoginDialogActionTaken() {
@ -5273,6 +5269,8 @@ void Application::resumeAfterLoginDialogActionTaken() {
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
if (!accountManager->isLoggedIn()) { if (!accountManager->isLoggedIn()) {
addressManager->goToEntry(); addressManager->goToEntry();
} else {
addressManager->loadSettings();
} }
const auto& nodeList = DependencyManager::get<NodeList>(); const auto& nodeList = DependencyManager::get<NodeList>();
@ -5282,13 +5280,9 @@ void Application::resumeAfterLoginDialogActionTaken() {
auto menu = Menu::getInstance(); auto menu = Menu::getInstance();
menu->getMenu("Edit")->setVisible(true); menu->getMenu("Edit")->setVisible(true);
menu->getMenu("Edit")->setEnabled(true);
menu->getMenu("View")->setVisible(true); menu->getMenu("View")->setVisible(true);
menu->getMenu("View")->setEnabled(true);
menu->getMenu("Navigate")->setVisible(true); menu->getMenu("Navigate")->setVisible(true);
menu->getMenu("Navigate")->setEnabled(true);
menu->getMenu("Settings")->setVisible(true); menu->getMenu("Settings")->setVisible(true);
menu->getMenu("Settings")->setEnabled(true);
} }
void Application::loadAvatarScripts(const QVector<QString>& urls) { void Application::loadAvatarScripts(const QVector<QString>& urls) {