Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json

interface/src/Application.cpp

@@ -1818,6 +1818,9 @@ void Application::initDisplay() {
 }
 
 void Application::init() {
+    // Make sure Login state is up to date
+    DependencyManager::get<DialogsManager>()->toggleLoginDialog();
+    
     _environment.init();
 
     DependencyManager::get<DeferredLightingEffect>()->init(this);

libraries/shared/src/DependencyManager.h

@@ -17,18 +17,25 @@
 #include <QSharedPointer>
 #include <QWeakPointer>
 
+#include <functional>
 #include <typeinfo>
 
 #define SINGLETON_DEPENDENCY \
     friend class DependencyManager;
 
 class Dependency {
+public:
+    typedef std::function<void(Dependency* pointer)> DeleterFunction;
+    
 protected:
     virtual ~Dependency() {}
     virtual void customDeleter() {
-        delete this;
+        _customDeleter(this);
     }
-
+    
+    void setCustomDeleter(DeleterFunction customDeleter) { _customDeleter = customDeleter; }
+    DeleterFunction _customDeleter = [](Dependency* pointer) { delete pointer; };
+    
     friend class DependencyManager;
 };