Fix showing some types of errors in login screen

Double fixes #402
2022-11-21 22:45:26 +02:00
parent 6aaeb8c244
commit 68e9d6e981
1 changed files with 4 additions and 2 deletions
--- a/ui/view-login.go
+++ b/ui/view-login.go
@@ -166,10 +166,12 @@ func (view *LoginView) actuallyLogin(hs, mxid, password string) {
 		view.Error(err.Error())
 	} else if err = view.matrix.Login(mxid, password); err != nil {
 		if httpErr, ok := err.(mautrix.HTTPError); ok {
-			if httpErr.RespError != nil {
+			if httpErr.RespError != nil && len(httpErr.RespError.Err) > 0 {
 				view.Error(httpErr.RespError.Err)
-			} else {
+			} else if len(httpErr.Message) > 0 {
 				view.Error(httpErr.Message)
+			} else {
+				view.Error(err.Error())
 			}
 		} else {
 			view.Error(err.Error())