From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sat, 11 Jul 2009 17:29:52 +0000 (+0000)
Subject: * GuiBranches.cpp: avoid message after cancel.
X-Git-Tag: 2.0.0~6082
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1704c727de05dcb5eb6acba1c2cda85b5991f458;p=features.git

* GuiBranches.cpp: avoid message after cancel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30487 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiBranches.cpp b/src/frontends/qt4/GuiBranches.cpp
index 9f73cd4c7c..b3af3ed293 100644
--- a/src/frontends/qt4/GuiBranches.cpp
+++ b/src/frontends/qt4/GuiBranches.cpp
@@ -175,13 +175,14 @@ void GuiBranches::on_renamePB_pressed()
 				success = branchlist_.rename(oldname, newname);
 			newBranchLE->clear();
 			updateView();
+
+			if (!success)
+				Alert::error(_("Renaming failed"), 
+				      _("The branch could not be renamed."));
+			else
+				// emit signal
+				renameBranches(oldname, newname);
 		}
-		if (!success)
-			Alert::error(_("Renaming failed"), 
-			      _("The branch could not be renamed."));
-		else
-			// emit signal
-			renameBranches(oldname, newname);
 	}
 }