Merge a6b4392fd7549f23fef1faaaa146c5408011d7c5 into bdaf55a68ff66b8dd02ae6420a244650a355af17

src/client/client.go

@@ -1168,6 +1168,7 @@ func prefixUsernameMembers(members []string) []string {
 }
 
 func (s *SignalClient) updateGroupMembers(number string, groupId string, members []string, add bool) error {
+	var err error
 
 	if len(members) == 0 {
 		return nil
@@ -1206,7 +1207,6 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
 			return err
 		}
 		_, err = jsonRpc2Client.getRaw("updateGroup", &number, request)
-		return err
 	} else {
 		cmd := []string{"--config", s.signalCliConfig, "-a", number, "updateGroup", "-g", internalGroupId}
 
@@ -1218,8 +1218,8 @@ func (s *SignalClient) updateGroupMembers(number string, groupId string, members
 		cmd = append(cmd, members...)
 
 		_, err = s.cliClient.Execute(true, cmd, "")
-		return err
 	}
+	return err
 }
 
 func (s *SignalClient) AddMembersToGroup(number string, groupId string, members []string) error {