History

it's working! removed my null pointer and just get it from the dependency manager when required

Liv Erickson committed 8 years ago

Commit 0e3a01f1 parent 20635ac2 files · +2 −5Browse files

Showing the changes to interface/src/scripting/WalletScriptingInterface.cpp (1 of 2 files). Show all

Unified · Split

interface/src/scripting/WalletScriptingInterface.cpp+2−3
@@ -16,7 +16,6 @@ CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(q · 15 unmodified lines
16}16}
17 17
18WalletScriptingInterface::WalletScriptingInterface() {18WalletScriptingInterface::WalletScriptingInterface() {
19 _contextOverlayInterface = DependencyManager::get<ContextOverlayInterface>();
20 19
21 _entityPropertyFlags += PROP_POSITION;20 _entityPropertyFlags += PROP_POSITION;
22 _entityPropertyFlags += PROP_ROTATION;21 _entityPropertyFlags += PROP_ROTATION;
@@ -43,9 +42,9 @@ void WalletScriptingInterface::proveAvatarEntityOwnershipVerification(const QUui · 20 unmodified lines
43 if (!entityID.isNull() && entityProperties.getMarketplaceID().length() > 0) {42 if (!entityID.isNull() && entityProperties.getMarketplaceID().length() > 0) {
44 if (!entityProperties.getClientOnly()) {43 if (!entityProperties.getClientOnly()) {
45 qCDebug(entities) << "Failed to prove ownership of:" << entityID << "is not an avatar entity";44 qCDebug(entities) << "Failed to prove ownership of:" << entityID << "is not an avatar entity";
46 emit _contextOverlayInterface->ownershipVerificationFailed(entityID);45 emit DependencyManager::get<ContextOverlayInterface>()->ownershipVerificationFailed(entityID);
47 return;46 return;
48 }47 }
49 _contextOverlayInterface->requestOwnershipVerification(entityID);48 DependencyManager::get<ContextOverlayInterface>()->requestOwnershipVerification(entityID);
50 }49 }
51}50}