fix for sd/cf double whammy insert/eject on resume

1 files changed, 4 insertions, 2 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index c0a936f..74e8837 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -139,179 +139,181 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
         } else {
             cmd = "/etc/sdcontrol compeject";
             err = system( ( const char *) cmd );
             if ( ( err != 0 ) ) {
                 qDebug( "Could not execute `/etc/sdcontrol comeject'! err=%d", err );
                 popUp( tr("SD/MMC card eject failed!") );
             }
         }
     } else if ( opt == 2 ) {
         cmd = "/sbin/cardctl eject 1";
         err = system( ( const char *) cmd );
 	if ( ( err == 127 ) || ( err < 0 ) ) {
 	    qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err );
 	    popUp( tr( "CF/PCMCIA card eject failed!" ) );
 	}
     }
     delete menu;
 }
 
 
 void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
     if ( msg == "stabChanged()" ) {
        // qDebug("Pcmcia: stabchanged");
         if ( getStatusPcmcia() ) {
             repaint( FALSE );
         }
     } else if ( msg == "mtabChanged()" ) {
         qDebug("CARDMONAPPLET: mtabchanged");
         if ( getStatusSd() ) {
             repaint( FALSE );
         }
     }
 }
 
 bool CardMonitor::getStatusPcmcia( int showPopUp ) {
 
     bool cardWas0 = cardInPcmcia0; // remember last state
     bool cardWas1 = cardInPcmcia1;
 
     QString fileName;
 
     // one of these 3 files should exist
     if ( QFile::exists( "/var/run/stab" ) ) {
         fileName = "/var/run/stab";
     } else if (QFile::exists( "/var/state/pcmcia/stab" ) )  {
         fileName = "/var/state/pcmcia/stab";
     } else {
         fileName = "/var/lib/pcmcia/stab";
     }
 
     QFile f( fileName );
 
     if ( f.open( IO_ReadOnly ) ) {
         QStringList list;
         QTextStream stream ( &f );
         QString streamIn;
         streamIn = stream.read();
         list = QStringList::split( "\n", streamIn );
         for( QStringList::Iterator line=list.begin(); line!=list.end(); line++ ) {
             if( (*line).startsWith( "Socket 0:" ) ){
                 if( (*line).startsWith( "Socket 0: empty" ) && cardInPcmcia0  ){
                     cardInPcmcia0 = FALSE;
                 } else if ( !(*line).startsWith( "Socket 0: empty" ) && !cardInPcmcia0 ){
                     cardInPcmcia0Name = (*line).mid( ( (*line).find( ':' ) + 1 ), (*line).length() - 9 );
                     cardInPcmcia0Name.stripWhiteSpace();
                     cardInPcmcia0 = TRUE;
                     show();
                     line++;
 	    int pos=(*line).find('\t' ) + 1;
 	    cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos );
                 }
             }  else if( (*line).startsWith( "Socket 1:" ) ){
                 if( (*line).startsWith( "Socket 1: empty" ) && cardInPcmcia1 ) {
                     cardInPcmcia1 = FALSE;
                 } else if ( !(*line).startsWith( "Socket 1: empty" ) && !cardInPcmcia1 ) {
                     cardInPcmcia1Name = (*line).mid(((*line).find(':') + 1), (*line).length() - 9  );
                     cardInPcmcia1Name.stripWhiteSpace();
                     cardInPcmcia1 = TRUE;
                     show();
                     line++;
 	    int pos=(*line).find('\t') + 1;
 	    cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos );
                 }
             }
         }
         f.close();
 
         if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1) ) {
             QString text = QString::null;
             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;
     }
     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;
             }
+//            else {
+//                 cardInSd = FALSE;
+//             }
         }
         endmntent( mntfp );
     }
 
     if( !showPopUp && cardWas != cardInSd ) {
         QString text = QString::null;
         QString what = QString::null;
         if( cardInSd )  {
             text += "SD Inserted";
             what = "on";
         }  else {
             text += "SD Removed";
             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
     return ( ( cardWas == cardInSd) ? FALSE : TRUE );
 }
 
 void CardMonitor::paintEvent( QPaintEvent * ) {
 
     QPainter p( this );
 
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
         p.drawPixmap( 0, 0, pm );
         show();
     } else {
         p.eraseRect( rect() );
         hide();
     }
 }