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

Merge pull request #15262 from roxanneskelly/Case20832

Browse source 
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
This commit is contained in:
Roxanne Skelly 2019-03-28 12:01:24 -07:00 committed by GitHub
commit 73cf51182e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml
View file

@ -664,7 +664,7 @@ Rectangle {
text: "LOG IN" text: "LOG IN"
onClicked: { onClicked: {
sendToScript({method: 'needsLogIn_loginClicked'}); sendToScript({method: 'marketplace_loginClicked'});
} }
} }

4
interface/src/Application.cpp
View file

@ -1206,10 +1206,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle())); connect(&domainHandler, SIGNAL(connectedToDomain(QUrl)), SLOT(updateWindowTitle()));
connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() { connect(&domainHandler, &DomainHandler::disconnectedFromDomain, this, [this]() {
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
if (tabletScriptingInterface) {
tabletScriptingInterface->setQmlTabletRoot(SYSTEM_TABLET, nullptr);
}
auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>(); auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
entityScriptingInterface->deleteEntity(getTabletScreenID()); entityScriptingInterface->deleteEntity(getTabletScreenID());
entityScriptingInterface->deleteEntity(getTabletHomeButtonID()); entityScriptingInterface->deleteEntity(getTabletHomeButtonID());

3
scripts/system/commerce/wallet.js
View file

@ -377,6 +377,9 @@ function deleteSendMoneyParticleEffect() {
} }
function onUsernameChanged() { function onUsernameChanged() {
if (ui.checkIsOpen()) {
ui.open(WALLET_QML_SOURCE);
}
} }
var MARKETPLACE_QML_PATH = "hifi/commerce/marketplace/Marketplace.qml"; var MARKETPLACE_QML_PATH = "hifi/commerce/marketplace/Marketplace.qml";

3
scripts/system/marketplaces/marketplaces.js
View file

@ -615,11 +615,10 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
openMarketplace(message.itemId, message.itemEdition); openMarketplace(message.itemId, message.itemEdition);
break; break;
case 'passphrasePopup_cancelClicked': case 'passphrasePopup_cancelClicked':
case 'needsLogIn_cancelClicked':
// Should/must NOT check for wallet setup. // Should/must NOT check for wallet setup.
openMarketplace(); openMarketplace();
break; break;
case 'needsLogIn_loginClicked': case 'marketplace_loginClicked':
openLoginWindow(); openLoginWindow();
break; break;
case 'disableHmdPreview': case 'disableHmdPreview':