fix bug 0000591

AppLnk does not need to reload all labels but it needs to reload
the names for the ids in mCat

1 files changed, 7 insertions, 2 deletions

diff --git a/library/applnk.cpp b/library/applnk.cpp
index 5763c62..35822dd 100644
--- a/library/applnk.cpp
+++ b/library/applnk.cpp
@@ -86,13 +86,17 @@ public:
     QMap<int,  QPixmap> mPixmaps;
 
     void updateCatListFromArray()
     {
 	Categories cat( 0 );
 	cat.load( categoryFileName() );
-	mCatList = cat.labels("Document View",mCat);
+	// we need to update the names for the mCat... to mCatList
+        mCatList.clear();
+        for (uint i = 0; i < mCat.count(); i++ )
+            mCatList << cat.label("Document View", mCat[i] );
+
     }
 
     void setCatArrayDirty()
     {
 	mCat.resize(0);
     }
@@ -403,12 +407,13 @@ AppLnk::AppLnk( const QString &file )
     }
     mId = 0;
 }
 
 AppLnk& AppLnk::operator=(const AppLnk &copy)
 {
+    if ( this == &copy ) return *this;
     if ( mId )
 	qWarning("Deleting AppLnk that is in an AppLnkSet");
     if ( d )
 	delete d;
 
 
@@ -847,13 +852,13 @@ void AppLnk::storeLink() const
     config.writeEntry("Name",mName);
     if ( !mIconFile.isNull() ) config.writeEntry("Icon",mIconFile);
     config.writeEntry("Type",type());
     if(!rotation().isEmpty())
 	config.writeEntry("Rotation",rotation());
     else
-	config.removeEntry("Rotation");    
+	config.removeEntry("Rotation");
     if ( !mComment.isNull() ) config.writeEntry("Comment",mComment);
     QString f = file();
     int i = 0;
     while ( i < (int)f.length() && i < (int)mLinkFile.length() && f[i] == mLinkFile[i] )
 	i++;
     while ( i && f[i] != '/' )