summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorleo2006-01-06 00:17:51 +0000
committerleo2006-01-06 00:17:51 +0000
commit80e4ad21bbf133c4b763274c10e9d228c6a457a0 (patch)
tree91437130c185093109252d851cf7f46f77807485 /common
parentb463aef5bdc800972f61d9d6ee8087533f011dff (diff)
Fixed multiple Search Results in categories bug.
git-svn-id: http://svn.leocad.org/trunk@452 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'common')
-rwxr-xr-xcommon/library.cpp20
-rwxr-xr-xcommon/library.h4
2 files changed, 20 insertions, 4 deletions
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