From 78f94986e383ac2bb6d11157b652f09496b673f5 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sat, 25 Mar 2017 03:44:12 -0400
Subject: user/settings: fix bad error handle of leave organization

---
 routers/user/setting.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/routers/user/setting.go b/routers/user/setting.go
index b9d6c81e..9138ba04 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -442,11 +442,13 @@ func SettingsOrganizations(ctx *context.Context) {
 
 func SettingsLeaveOrganization(ctx *context.Context) {
 	err := models.RemoveOrgUser(ctx.QueryInt64("id"), ctx.User.ID)
-	if models.IsErrLastOrgOwner(err) {
-		ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
-	} else {
-		ctx.Handle(500, "RemoveOrgUser", err)
-		return
+	if err != nil {
+		if models.IsErrLastOrgOwner(err) {
+			ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
+		} else {
+			ctx.Handle(500, "RemoveOrgUser", err)
+			return
+		}
 	}
 
 	ctx.JSON(200, map[string]interface{}{
-- 
cgit v1.2.3