Merge branch 'master' into staging

2018-04-27 17:51:12 +02:00
parent b21f42747d 41583b7858
commit 009eb13fc3
5 changed files with 63 additions and 4 deletions
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@@ -258,7 +258,10 @@ define([
                                // logMeIn should reset registering = false
                                UI.removeLoadingScreen(function () {
                                    UI.confirm(Messages.register_alreadyRegistered, function (yes) {
-                                        if (!yes) { return; }
+                                        if (!yes) {
+                                            hashing = false;
+                                            return;
+                                        }
                                        proxy.login_name = uname;

                                        if (!proxy[Constants.displayNameKey]) {