From 32b5c84becba7fa13332eee8c849b86701bd1fbb Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 24 Oct 2016 10:27:27 -0700 Subject: [PATCH] Update ConnectionMonitor to init at end of startup --- interface/src/Application.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d9d90053f0..4c20b924ae 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -873,8 +873,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo UserActivityLogger::getInstance().logAction("launch", properties); - _connectionMonitor.init(); - // Tell our entity edit sender about our known jurisdictions _entityEditSender.setServerJurisdictions(&_entityServerJurisdictions); _entityEditSender.setMyAvatar(myAvatar.get()); @@ -1367,6 +1365,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo } } + _connectionMonitor.init(); + // After all of the constructor is completed, then set firstRun to false. firstRun.set(false); }