From 60a6be33b5513860aa5d4a3ebab579a4f90c39dd Mon Sep 17 00:00:00 2001
From: charras <Unknown>
Date: Mon, 15 Feb 2010 14:24:52 +0000
Subject: [PATCH] eeschema, fixed : after a change in library list (Preference
 menu) the library cache was the first in priority list (now it is the last
 ,as it does)

---
 eeschema/class_library.cpp                | 4 ++--
 eeschema/dialog_edit_component_in_lib.cpp | 1 -
 eeschema/eelibs_read_libraryfiles.cpp     | 5 +++--
 eeschema/files-io.cpp                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/eeschema/class_library.cpp b/eeschema/class_library.cpp
index 65e44773c5..f67acfc783 100644
--- a/eeschema/class_library.cpp
+++ b/eeschema/class_library.cpp
@@ -48,9 +48,9 @@ bool operator!=( const CMP_LIBRARY& aLibrary, const wxChar* aName )
 bool operator<( const CMP_LIBRARY& aItem1, const CMP_LIBRARY& aItem2 )
 {
     /* The cache library always is sorted to the end of the library list. */
-    if( aItem1.IsCache() )
-        return true;
     if( aItem2.IsCache() )
+        return true;
+    if( aItem1.IsCache() )
         return false;
 
     /* If the sort order array isn't set, then sort alphabetically except. */
diff --git a/eeschema/dialog_edit_component_in_lib.cpp b/eeschema/dialog_edit_component_in_lib.cpp
index b5f40d1f16..e8114fa27a 100644
--- a/eeschema/dialog_edit_component_in_lib.cpp
+++ b/eeschema/dialog_edit_component_in_lib.cpp
@@ -23,7 +23,6 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY::DIALOG_EDIT_COMPONENT_IN_LIBRARY( WinEDA_Libed
 {
 	m_Parent = aParent;
 	m_RecreateToolbar = false;
-	m_AliasLocation = -1;
 
 	Init();
 
diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp
index cca62d4239..af76cf55c2 100644
--- a/eeschema/eelibs_read_libraryfiles.cpp
+++ b/eeschema/eelibs_read_libraryfiles.cpp
@@ -106,15 +106,16 @@ Error: %s" ),
     CMP_LIBRARY::GetLibraryList().sort();
 
 #ifdef __WXDEBUG__
-    wxLogDebug( wxT( "Requested component library sort order." ) );
+    wxLogDebug( wxT( "LoadLibraries () requested component library sort order:" ) );
 
     for( size_t i = 0; i < sortOrder.GetCount(); i++ )
         wxLogDebug( wxT( "    " ) + sortOrder[i] );
 
-    wxLogDebug( wxT( "Component library sort order:" ) );
+    wxLogDebug( wxT( "Real component library sort order:" ) );
 
     for ( i = CMP_LIBRARY::GetLibraryList().begin();
           i < CMP_LIBRARY::GetLibraryList().end(); i++ )
         wxLogDebug( wxT( "    " ) + i->GetName() );
+    wxLogDebug( wxT( "end LoadLibraries ()" ) );
 #endif
 }
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 9fa8a26671..cfb40aed17 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -165,7 +165,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
     {
         wxString errMsg;
 
-        wxLogDebug( wxT( "Load schematic cache library file <%s>" ),
+        wxLogDebug( wxT( "LoadOneEEProject() load schematic cache library file <%s>" ),
                     GetChars( fn.GetFullPath() ) );
         msg = wxT( "Load " ) + fn.GetFullPath();