2 files changed, 34 insertions, 2 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index cf1a3c8..17a30e6 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
diff --git a/core/launcher/mrulist.cpp b/core/launcher/mrulist.cpp
index 4daf7d2..6066dac 100644
--- a/core/launcher/mrulist.cpp
+++ b/core/launcher/mrulist.cpp
@@ -1,13 +1,14 @@
 /**********************************************************************
+** Copyright (C) 2002 Holger 'zecke' Freyther
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
@@ -62,38 +63,66 @@ QSize MRUList::sizeHint() const
     return QSize( frameWidth(), 16 );
 }
 
 
 void MRUList::addTask( const AppLnk *appLnk )
 {
     if ( !appLnk )
         return;
     unsigned int i = 0;
 
     if ( !task )
         return;
+    // ok we wan't to delete old icons from the taskbar
+    // get the window list and see which windows aren't there any more
+    QList<AppLnk> cleanUp;
+    cleanUp.setAutoDelete( TRUE );
+    const QList<QWSWindow> &list = qwsServer->clientWindows();
+    QWSWindow* w;
+    bool running = false; // to see what we should do
+    for ( ; i < task->count(); i++ ) {
+      AppLnk *t = task->at(i);
+      running = false;
+      for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
+        QString app = w->client()->identity();
+        if( app == t->exec( ) ){
+          running = true;
+          break;
+        } 
+      }
+      if(!running ) { // gues what we do now
+        cleanUp.append( t);
+      }
+    }
+    // no do a clean up of these old icons
+    AppLnk *lnk;
+    for( lnk = cleanUp.first(); lnk != 0; lnk = cleanUp.next() ){
+      task->remove( lnk );
+    }    
+    cleanUp.clear(); // should be deleted too
 
+    i = 0;
     for ( ; i < task->count(); i++ ) {
         AppLnk *t = task->at(i);
         if ( t->exec() == appLnk->exec() ) {
             if (i != 0) {
                 task->remove();
                 task->prepend( t );
             }
             for (unsigned i = 0; i < MRUListWidgets->count(); i++ )
                 MRUListWidgets->at(i)->update();
             return;
         }
     }
-
+    // check which tasks are running and delete them from the list
     AppLnk *t = new AppLnk( *appLnk );
     // DocLnks have an overloaded virtual function exec()
     t->setExec( appLnk->exec() );
     task->prepend( t );
 
     if ( task->count() > 6 ) {
         t = task->last();
         task->remove();
         Global::terminate(t);
         delete t;
     }
 
@@ -115,28 +144,31 @@ bool MRUList::quitOldApps()
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
         QString app = w->client()->identity();
         if ( appsstarted.contains(app) && !appsrunning.contains(app) )
             appsrunning.append(app);
     }
 
     if ( appsrunning.count() > 1 ) {
         QStringList::ConstIterator it = appsrunning.begin();
         ++it; // top stays running!
         for (; it != appsrunning.end(); it++) {
             for ( int i=task->count()-1; i>=0; --i ) {
                 AppLnk *t = task->at(i);
-                if ( t->exec() == *it )
+                if ( t->exec() == *it ){
+                  task->remove(i );
+                  delete t;
                     Global::terminate(t);
             }
         }
+        }
         return TRUE;
     } else {
         return FALSE;
     }
 }
 
 
 void MRUList::mousePressEvent(QMouseEvent *e)
 {
     selected = 0;
     int x=0;
     QListIterator<AppLnk> it( *task );