From 2bb6af2a15463ee2a2fa2a362b9baf5cf95eb40f Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 13 Oct 2018 18:51:23 +0000
Subject: [PATCH] Ide: Minor fixes related to upgrade ide option.

git-svn-id: svn://ultimatepp.org/upp/trunk@12364 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Upgrade.cpp | 2 +-
 uppsrc/ide/idebar.cpp  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/uppsrc/ide/Upgrade.cpp b/uppsrc/ide/Upgrade.cpp
index d415b38bd..fb6dd52c6 100644
--- a/uppsrc/ide/Upgrade.cpp
+++ b/uppsrc/ide/Upgrade.cpp
@@ -5,7 +5,7 @@ void Ide::UpgradeTheIDE()
 	String idepath = GetExeFilePath();
 	String newpath = idepath + ".new";
 	String bakpath(~idepath, GetFileExtPos(idepath));
-	bakpath << ".bak.exe";
+	bakpath << ".bak" << GetExeExt();
 	
 	int tbak = targetmode;
 	String tmbak = StoreAsString(release);
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 77bd0108d..1baa89694 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -389,6 +389,7 @@ void Ide::Setup(Bar& menu)
 	menu.Add("Automatic build methods setup..", callback(InstantSetup))
 	    .Help("Setups/fixes build methods and basic assemblies..");
 #endif
+	menu.MenuSeparator();
 	menu.Add("Checkout and setup U++ SVN trunk sources..", [=] {
 		if(SetupSVNTrunk()) {
 			IdeAgain = true;
@@ -400,7 +401,7 @@ void Ide::Setup(Bar& menu)
 	if(wspc[0] == "ide")
 		for(int i = 0; i < wspc.GetCount(); i++)
 			if(wspc[i] == "ide/Core")
-				menu.Add("Upgrade theide..", [=] { UpgradeTheIDE(); });
+				menu.Add("Upgrade TheIDE..", [=] { UpgradeTheIDE(); });
 
 	if(menu.IsMenuBar())
 		SetupMobilePlatforms(menu);