From 931a7206923a82e00765f48c7f4caae56db9e82f Mon Sep 17 00:00:00 2001
From: Mrs4s <mrs4sxiaoshi@gmail.com>
Date: Fri, 26 Mar 2021 16:03:00 +0800
Subject: [PATCH] fix conflict of password encryption and qrcode login.

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 175925d..ba8c659 100644
--- a/main.go
+++ b/main.go
@@ -311,7 +311,7 @@ func main() {
 	global.Proxy = conf.ProxyRewrite
 	// b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
 	// c := server.Console
-	isQRCodeLogin := conf.Uin == 0 || len(conf.Password) == 0
+	isQRCodeLogin := (conf.Uin == 0 || len(conf.Password) == 0) && len(conf.PasswordEncrypted) == 0
 	if !isQRCodeLogin {
 		if err := commonLogin(); err != nil {
 			log.Fatalf("登录时发生致命错误: %v", err)