1

server/imserver_new/guild/guild.go

@@ -160,25 +160,28 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) {
 			if m.isJob(constant.GuildMemberLevelLeader) {
 				nextLeader := this.chooseLeader()
 				if nextLeader != nil {
-					chooseOk := false
 					model.GuildMember.SetJob(this.guildId, m.memberId, constant.GuildMemberLevelLeader,
 						func (err error, lastInsertId int64, rowsAffected int64) {
-							chooseOk = err == nil
+							if err != nil {
+								cb(500, "server internal error")
+								return
+							}
+							cb(0, "")
+							return
 						})
-					if chooseOk {
+				} else {
-						nextLeader.guildJob = constant.GuildMemberLevelLeader
+					if this.GetMemberNum() <= 0 {
-						cb(0, "")
+						this.disband()
-						return
-					} else {
-						cb(500, "server internal error")
-						return
 					}
+					cb(0, "")
+					return
 				}
+			} else {
+				if this.GetMemberNum() <= 0 {
+					this.disband()
+				}
+				cb(0, "")
 			}
-			if this.GetMemberNum() <= 0 {
-				this.disband()
-			}
-			cb(0, "")
 		})
 }
 

third_party/f5

@@ -1 +1 @@
-Subproject commit 7ebe70aba4a34b3025a7877572328aded27bb76e
+Subproject commit d15c5a061f10976efcc20d63c65634dfb11108e9