From 80e4ad21bbf133c4b763274c10e9d228c6a457a0 Mon Sep 17 00:00:00 2001 From: leo Date: Fri, 6 Jan 2006 00:17:51 +0000 Subject: Fixed multiple Search Results in categories bug. git-svn-id: http://svn.leocad.org/trunk@452 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- common/library.cpp | 20 ++++++++++++++++++-- common/library.h | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/library.cpp b/common/library.cpp index adfb3b2..6542c90 100755 --- a/common/library.cpp +++ b/common/library.cpp @@ -475,9 +475,25 @@ bool PiecesLibrary::DoSaveCategories(bool AskName) File.WriteInt(LC_CATEGORY_FILE_ID); File.WriteInt(LC_CATEGORY_FILE_VERSION); - File.WriteInt(m_Categories.GetSize()); - for (int i = 0; i < m_Categories.GetSize(); i++) + int NumCategories = m_Categories.GetSize(); + int i; + + for (i = 0; i < m_Categories.GetSize(); i++) + { + if (m_Categories[i].Name == "Search Results") + { + NumCategories--; + break; + } + } + + + File.WriteInt(NumCategories); + for (i = 0; i < m_Categories.GetSize(); i++) { + if (m_Categories[i].Name == "Search Results") + continue; + File.WriteString(m_Categories[i].Name); File.WriteString(m_Categories[i].Keywords); } diff --git a/common/library.h b/common/library.h index 7e638ef..fdd1f2f 100755 --- a/common/library.h +++ b/common/library.h @@ -44,10 +44,10 @@ public: bool DoSaveCategories(bool AskName); bool LoadCategories(const char* FileName); - const char* GetCategoryName(int Index) const + const String& GetCategoryName(int Index) const { return m_Categories[Index].Name; } - const char* GetCategoryKeywords(int Index) const + const String& GetCategoryKeywords(int Index) const { return m_Categories[Index].Keywords; } int GetNumCategories() const -- cgit v1.2.3