merge branch into master

2021-12-28 10:43:59 +08:00
parent 3c56b33156
commit fff9034e0e
8 changed files with 37 additions and 7 deletions
--- a/src/json/jsonobject.cpp
+++ b/src/json/jsonobject.cpp
@@ -326,6 +326,8 @@ QString JsonObject::interfaceName()

 QString JsonObject::passWord()
 {
+    if (!loadcfg())
+        return QString("");
 	return tmp_psw;
 }