Merge afb62b149f3e9f7472c127db41343a546ebe5ea8 into 8533043ba2b4f03510cfc3ee9839140ec21c4fe2

src/client/client.go

@@ -1231,6 +1231,8 @@ func (s *SignalClient) RemoveMembersFromGroup(number string, groupId string, mem
 }
 
 func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins []string, add bool) error {
+	var err error
+
 	if len(admins) == 0 {
 		return nil
 	}
@@ -1268,7 +1270,6 @@ func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins [
 			return err
 		}
 		_, err = jsonRpc2Client.getRaw("updateGroup", &number, request)
-		return err
 	} else {
 		cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-g", internalGroupId}
 
@@ -1280,8 +1281,8 @@ func (s *SignalClient) updateGroupAdmins(number string, groupId string, admins [
 		cmd = append(cmd, admins...)
 
 		_, err = s.cliClient.Execute(true, cmd, "")
-		return err
 	}
+	return err
 }
 
 func (s *SignalClient) AddAdminsToGroup(number string, groupId string, admins []string) error {