From 4e3b601d5769fd2be986f250cfb538b4e6a7dfac Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 4 Jun 2014 13:28:13 +0000
Subject: [PATCH] ide: fixed some edit mode issues

git-svn-id: svn://ultimatepp.org/upp/trunk@7415 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Config.cpp  | 6 ++++--
 uppsrc/ide/UppWspc.cpp | 8 ++++----
 uppsrc/ide/idewin.cpp  | 3 +--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/uppsrc/ide/Config.cpp b/uppsrc/ide/Config.cpp
index bde71cc7a..67ed81d2d 100644
--- a/uppsrc/ide/Config.cpp
+++ b/uppsrc/ide/Config.cpp
@@ -117,13 +117,15 @@ bool Ide::IsEditorMode() const
 
 void Ide::SaveLastMain()
 {
-	if(main.GetCount())
-		StoreToFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
+	StoreToFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
 }
 
 void Ide::LoadLastMain()
 {
+	bool editor = IsEditorMode();
 	LoadFromFile(THISBACK(SerializeLastMain), ConfigFile("lastmain.cfg"));
+	if(editor)
+		main <<= Null;
 }
 
 void Sentinel(Stream& s, const char *txt)
diff --git a/uppsrc/ide/UppWspc.cpp b/uppsrc/ide/UppWspc.cpp
index 2a0a61802..6c8d677d0 100644
--- a/uppsrc/ide/UppWspc.cpp
+++ b/uppsrc/ide/UppWspc.cpp
@@ -133,12 +133,12 @@ void WorkspaceWork::ScanWorkspace() {
 		package.Add(pk, Null, fnt, Nvl(pi.ink, SColorText()), false, 0, Null, SColorMark);
 	}
 	if(!organizer) {
-		if(main.GetCount()) {
+		if(main.GetCount())
 			package.Add(prjaux, IdeImg::PrjAux(), ListFont(), Magenta);
-			package.Add(METAPACKAGE, IdeImg::Meta(), ListFont(), Red);
-		}
-		package.Add(tempaux, IdeImg::TempAux(), ListFont(), Magenta);
 		package.Add(ideaux, IdeImg::IdeAux(), ListFont(), Magenta);
+		package.Add(tempaux, IdeImg::TempAux(), ListFont(), Magenta);
+		if(main.GetCount())
+			package.Add(METAPACKAGE, IdeImg::Meta(), ListFont(), Red);
 	}
 	package.SetCursor(0);
 	
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index 4db52036b..ca413eebc 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -944,8 +944,7 @@ void AppMain___()
 			Ini::user_log = true;
 		}
 		
-		if(!ide.IsEditorMode())
-			ide.LoadLastMain();
+		ide.LoadLastMain();
 		if(clset || ide.OpenMainPackage()) {
 			ide.SaveLastMain();
 			ide.isscanning++;