From d6c1f1c99a93109a6a94d4437d05abac71fbd354 Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Fri, 24 Feb 2017 18:18:48 -0800 Subject: [PATCH 1/2] Fixed Wed Entity not leaving Focus --- interface/src/Application.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3de7906f56..3b5a17ae92 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1216,6 +1216,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo if (entity && entity->wantsKeyboardFocus()) { setKeyboardFocusOverlay(UNKNOWN_OVERLAY_ID); setKeyboardFocusEntity(entityItemID); + } else { + setKeyboardFocusEntity(UNKNOWN_ENTITY_ID); } }); From a4e0d970bf68c38c73968d5b777a7039f550c5d6 Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Fri, 24 Feb 2017 19:03:30 -0800 Subject: [PATCH 2/2] Fix security section of domain server --- domain-server/resources/web/settings/js/settings.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index c5f055bed0..7642a66867 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -996,6 +996,10 @@ function saveSettings() { if (password && password.length > 0) { formJSON["security"]["http_password"] = sha256_digest(password); } + var verify_password = formJSON["security"]["verify_http_password"]; + if (verify_password && verify_password.length > 0) { + formJSON["security"]["verify_http_password"] = sha256_digest(verify_password); + } } // verify that the password and confirmation match before saving @@ -1010,7 +1014,6 @@ function saveSettings() { bootbox.alert({"message": "Passwords must match!", "title":"Password Error"}); canPost = false; } else { - formJSON["security"]["http_password"] = sha256_digest(password); delete formJSON["security"]["verify_http_password"]; } }