hide cardmon applet if no medium is inserted

1 files changed, 5 insertions, 2 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 25bb137..f3f9044 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -246,96 +246,99 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
             QString what = QString::null;
             if (cardWas0 != cardInPcmcia0) {
                 if (cardInPcmcia0) {
                     text += tr("New card: ");
                     what = "on";
                 } else {
                     text += tr("Ejected: ");
                     what = "off";
                 }
                 text += cardInPcmcia0Name;
                 popUp(text, "cardmon/" + cardInPcmcia0Type);
             }
 
             if (cardWas1 != cardInPcmcia1) {
                 if (cardInPcmcia1) {
                     text += tr("New card: ");
                     what = "on";
                 } else {
                     text += tr("Ejected: ");
                     what = "off";
                 }
                 text += cardInPcmcia1Name;
                 popUp(text, "cardmon/" + cardInPcmcia1Type);
             }
             QSound::play(Resource::findSound("cardmon/card" + what));
         }
     } else {
         // no file found
         qDebug("no file found");
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
     }
+    repaint( FALSE );
     return ((cardWas0 == cardInPcmcia0
              && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
+
 }
 
 
 bool CardMonitor::getStatusSd(int showPopUp)
 {
 
             bool cardWas = cardInSd;// remember last state
     cardInSd = FALSE;
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     struct mntent *me;
     FILE *mntfp = setmntent("/etc/mtab", "r");
 
     if (mntfp) {
         while ((me = getmntent(mntfp)) != 0) {
             QString fs = me->mnt_fsname;
             //qDebug( fs );
             if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
                 || fs.left(9) == "/dev/mmcd") {
                 cardInSd = TRUE;
                 show();
             }
 //            else {
 //                 cardInSd = FALSE;
 //             }
         }
         endmntent(mntfp);
     }
 
     if (!showPopUp && cardWas != cardInSd) {
         QString text = QString::null;
         QString what = QString::null;
         if (cardInSd) {
             text += "New card: SD/MMC";
             what = "on";
         } else {
             text += "Ejected: SD/MMC";
             what = "off";
         }
         //qDebug("TEXT: " + text );
         QSound::play(Resource::findSound("cardmon/card" + what));
                 popUp(text, "cardmon/ide");// XX add SD pic
     }
 #else
 #error "Not on Linux"
 #endif
+    repaint( FALSE );
     return ((cardWas == cardInSd) ? FALSE : TRUE);
 }
 
 void CardMonitor::paintEvent(QPaintEvent *)
 {
 
     QPainter p(this);
 
-    if (cardInPcmcia0 || cardInPcmcia1 || cardInSd) {
+    if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
         p.drawPixmap(0, 0, pm);
         show();
     } else {
-        p.eraseRect(rect());
+        //p.eraseRect(rect());
         hide();
     }
 }