Merge remote-tracking branch 'github/dev' into dev

3e51f523 · ibuler · 6695adbe · c098006b · 3e51f523
Commit 3e51f523 authored Jul 17, 2018 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

proxy.py coco/proxy.py +1 -1

No files found.
--- a/coco/proxy.py
+++ b/coco/proxy.py
@@ -51,7 +51,7 @@ class ProxyServer:
            self.client.send(warning(wr(msg, before=1, after=0)))
            return

-        if system_user.login_mode == MANUAL_LOGIN or not system_user.username:
+        if system_user.login_mode == MANUAL_LOGIN and not system_user.username:
            system_user_name = net_input(self.client, prompt='username: ', before=1)
            system_user.username = system_user_name