From d3cb88a89d74af142156559595b35f7e797c6d33 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 12 Jun 2009 08:56:17 +0000
Subject: [PATCH] theide: Fixed failed assert in package organizer

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

diff --git a/uppsrc/ide/UppDlg.cpp b/uppsrc/ide/UppDlg.cpp
index 44a0a9790..d6096f625 100644
--- a/uppsrc/ide/UppDlg.cpp
+++ b/uppsrc/ide/UppDlg.cpp
@@ -492,9 +492,16 @@ void PackageEditor::RemoveFileOption()
 }
 
 void PackageEditor::Serialize(Stream& s) {
-	int version = 2;
+	int version = 3;
 	s / version;
-	s % filelist % package % package;
+	if(version >= 3) {
+		filelist.SerializeSettings(s);
+		package.SerializeSettings(s);
+	}
+	else {
+		s % filelist;
+		s % package % package;
+	}
 	SerializePlacement(s);
 	if(version >= 1 && version <= 2) {
 		Splitter dummy;
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 8c8b43a95..ad3f0f59d 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -396,7 +396,7 @@ void Ide::BuildMenu(Bar& menu) {
 	menu.Add(b, AK_CLEANUPPOUT, THISBACK(CleanUppOut))
 		.Help("Remove all files and subdirectories in the output & intermediate directory (see Base setup)");
 
-	menu.MenuSeparator();
+//	menu.MenuSeparator();
 
 //	menu.Add(b, AK_CREATEMAKEFILE, THISBACK(CreateMakefile))
 //		.Help("Create makefile enabling IDE-independent project building");