History

Fix assert on interaction with stats and avatarinputs during UI setup

Brad Davis committed 8 years ago

Commit 6cc36131 parent 8bfc6101 file · +3 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+3−2
@@ -2681,7 +2681,6 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 2680 unmodified lines
2681 surfaceContext->setContextProperty("Overlays", &_overlays);2681 surfaceContext->setContextProperty("Overlays", &_overlays);
2682 surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());2682 surfaceContext->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
2683 surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());2683 surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
2684 surfaceContext->setContextProperty("Stats", Stats::getInstance());
2685 surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());2684 surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
2686 surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());2685 surfaceContext->setContextProperty("ScriptDiscoveryService", DependencyManager::get<ScriptEngines>().data());
2687 surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());2686 surfaceContext->setContextProperty("AvatarBookmarks", DependencyManager::get<AvatarBookmarks>().data());
@@ -2711,7 +2710,6 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 23 unmodified lines
2711 2710
2712 surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());2711 surfaceContext->setContextProperty("ApplicationCompositor", &getApplicationCompositor());
2713 2712
2714 surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
2715 surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());2713 surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
2716 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());2714 surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
2717 surfaceContext->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());2715 surfaceContext->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
@@ -2726,6 +2724,9 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) { · 8 unmodified lines
2726void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {2724void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
2727 Stats::show();2725 Stats::show();
2728 AvatarInputs::show();2726 AvatarInputs::show();
2727 auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
2728 surfaceContext->setContextProperty("Stats", Stats::getInstance());
2729 surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
2729}2730}
2730 2731
2731void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {2732void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {