History

move contextoverlay connection to contextoverlayinterface

SamGondelman committed 9 years ago

Commit c4e6cb21 parent 5bfb0ba4 files · +9 −25Browse files

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

Unified · Split

interface/src/Application.cpp+3−1
@@ -682,7 +682,6 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 681 unmodified lines
682682 DependencyManager::set<CloseEventSender>();
683683 DependencyManager::set<ResourceManager>();
684684 DependencyManager::set<SelectionScriptingInterface>();
685− DependencyManager::set<ContextOverlayInterface>();
686685 DependencyManager::set<Ledger>();
687686 DependencyManager::set<Wallet>();
688687 DependencyManager::set<WalletScriptingInterface>();
@@ -1173,7 +1172,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 484 unmodified lines
11731172 // allow you to move an entity around in your hand
11741173 _entityEditSender.setPacketsPerSecond(3000); // super high!!
11751174
1175+ // Overlays need to exist before we set the ContextOverlayInterface dependency
11761176 _overlays.init(); // do this before scripts load
1177+ DependencyManager::set<ContextOverlayInterface>();
1178+
11771179 // Make sure we don't time out during slow operations at startup
11781180 updateHeartbeat();
11791181