popupmenu now has parent 0 and gets deleted in timeout, to advoid a general slowdown of opie on resume/boot, which made it seem like opie was slow.

1 files changed, 3 insertions, 1 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 1663af2..4199273 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -65,45 +65,47 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
     repaint( FALSE );
     popupMenu = 0;
 }
 
 CardMonitor::~CardMonitor() {
     if( popupMenu ) {
         delete popupMenu;
     }
 }
 
 void CardMonitor::popUp( QString message, QString icon ) {
     if ( ! popupMenu ) {
-  popupMenu = new QPopupMenu();
+  popupMenu = new QPopupMenu(0);
     }
 
     popupMenu->clear();
     if( icon.isEmpty() ) {
   popupMenu->insertItem( message, 0 );
     } else {
   popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ),  message, 0 );
     }
 
     QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
     QSize s = popupMenu->sizeHint ();
     popupMenu->popup( QPoint (
                           p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
                           p. y ( ) - s. height ( ) ), 0);
 
     QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
 }
 
 void CardMonitor::popupTimeout() {
     popupMenu->hide();
+    popupMenu=0;
+    if(popupMenu) delete popupMenu;
 }
 
 void CardMonitor::mousePressEvent( QMouseEvent * ) {
     QPopupMenu *menu = new QPopupMenu();
     QString cmd;
     int err=0;
 
     if ( cardInSd ) {
         menu->insertItem( tr("Eject SD/MMC card"), 0 );
     }
 
     if ( cardInPcmcia0 ) {