1

server/imserver_new/guild/guild.go

@@ -160,19 +160,24 @@ 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) {
-							if err != nil {
-								cb(500, "server internal error")
-								return
-							}
-							nextLeader.guildJob = constant.GuildMemberLevelLeader
-							cb(0, "")
-							return
+							chooseOk = err == nil
 						})
+					if chooseOk {
+						nextLeader.guildJob = constant.GuildMemberLevelLeader
+						cb(0, "")
+						return
+					} else {
+						cb(500, "server internal error")
+						return
+					}
 				}
 			}
-			this.disband()
+			if this.GetMemberNum() <= 0 {
+				this.disband()
+			}
 			cb(0, "")
 		})
 }