1 files changed, 6 insertions, 7 deletions

diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index fa46543..6e63fca 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -469,63 +469,62 @@ void LauncherIconView::hideOrShowItems(bool resort)
         links.append(item->takeAppLnk());
         item = (LauncherItem*)item->nextItem();
     }
     viewport()->setUpdatesEnabled( FALSE );
     clear();
     QListIterator<AppLnk> it(links);
     AppLnk* l;
     while ((l=it.current())) {
         addItem(l,FALSE);
         ++it;
     }
     viewport()->setUpdatesEnabled( TRUE );
     if ( resort && !autoArrange() )
         sort();
 }
 
 bool LauncherIconView::removeLink(const QString& linkfile)
 {
     LauncherItem* item = (LauncherItem*)firstItem();
     AppLnk* l;
     bool did = FALSE;
     DocLnk dl(linkfile);
     while (item) {
         l = item->appLnk();
-        if (  l->linkFileKnown() && l->linkFile() == linkfile
-                || l->fileKnown() && (
-                    l->file() == linkfile
-                    || dl.isValid() && dl.file() == l->file() ) ) {
+        if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
+          || ( l->fileKnown() && ( l->file() == linkfile ))
+          || ( dl.fileKnown() && l->fileKnown() && ( dl.file() == l->file() )) ) {
             delete item;
             did = TRUE;
         }
         item = (LauncherItem*)item->nextItem();
     }
     QListIterator<AppLnk> it(hidden);
     while ((l=it.current())) {
         ++it;
-        if ( l->linkFileKnown() && l->linkFile() == linkfile
-                || l->file() == linkfile
-                || dl.isValid() && dl.file() == l->file() ) {
+        if ( ( l->linkFileKnown() && ( l->linkFile() == linkfile ))
+          || ( l->file() == linkfile )
+          || ( dl.fileKnown() && ( dl.file() == l->file() )) ) {
             hidden.removeRef(l);
            did = TRUE;
         }
     }
     return did;
 }
 
 static QString docLinkInfo(const Categories& cats, DocLnk* doc)
 {
     QString contents;
 
     QFileInfo fi( doc->file() );
     if ( !fi.exists() )
         return contents;
 
     if ( doc->linkFileKnown() ) {
         QString lfn = doc->linkFile();
         QFile f( lfn );
         if ( f.open( IO_ReadOnly ) ) {
             QTextStream ts( &f );
             ts.setEncoding( QTextStream::UnicodeUTF8 );
             contents += ts.read();
             f.close();
             goto calcsize;