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

1 files changed, 26 insertions, 24 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
@@ -76,3 +76,3 @@ void CardMonitor::popUp( QString message, QString icon ) {
     if ( ! popupMenu ) {
-	popupMenu = new QPopupMenu();
+  popupMenu = new QPopupMenu();
     }
@@ -81,5 +81,5 @@ void CardMonitor::popUp( QString message, QString icon ) {
     if( icon.isEmpty() ) {
-	popupMenu->insertItem( message, 0 );
+  popupMenu->insertItem( message, 0 );
     } else {
-	popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ),  message, 0 );
+  popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ),  message, 0 );
     }
@@ -115,3 +115,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
         menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type ) ),
-		tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
+    tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
@@ -121,4 +121,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     int opt = menu->exec( QPoint (
-	p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
-	p. y ( ) - s. height ( ) ), 0);
+  p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
+  p. y ( ) - s. height ( ) ), 0);
 
@@ -126,7 +126,7 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
         cmd = "/sbin/cardctl eject 0";
-	err = system( ( const char * ) cmd );
-	if ( ( err == 127 ) || ( err < 0 ) ) {
-	    qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err );
-	    popUp( tr( "CF/PCMCIA card eject failed!" ) );
-	}
+  err = system( ( const char * ) cmd );
+  if ( ( err == 127 ) || ( err < 0 ) ) {
+      qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d", err );
+      popUp( tr( "CF/PCMCIA card eject failed!" ) );
+  }
     } else if ( opt == 0 ) {
@@ -149,6 +149,6 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
         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!" ) );
-	}
+  if ( ( err == 127 ) || ( err < 0 ) ) {
+      qDebug( "Could not execute `/sbin/cardctl eject 1'! err=%d", err );
+      popUp( tr( "CF/PCMCIA card eject failed!" ) );
+  }
     }
@@ -206,4 +206,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                     line++;
-	    int pos=(*line).find('\t' ) + 1;
-	    cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos );
+      int pos=(*line).find('\t' ) + 1;
+      cardInPcmcia0Type = (*line).mid( pos, (*line).find( "\t" , pos) - pos );
                 }
@@ -218,4 +218,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                     line++;
-	    int pos=(*line).find('\t') + 1;
-	    cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos );
+      int pos=(*line).find('\t') + 1;
+      cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos );
                 }
@@ -237,3 +237,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                 text += cardInPcmcia0Name;
-	popUp( text, "cardmon/" + cardInPcmcia0Type );
+  popUp( text, "cardmon/" + cardInPcmcia0Type );
             }
@@ -248,4 +248,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
                 }
-	text += cardInPcmcia1Name;
-	popUp( text, "cardmon/" + cardInPcmcia1Type );
+  text += cardInPcmcia1Name;
+  popUp( text, "cardmon/" + cardInPcmcia1Type );
             }
@@ -266,2 +266,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
     bool cardWas = cardInSd; // remember last state
+    cardInSd = FALSE;
 
@@ -278,5 +279,6 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
                 show();
-            } else {
-                cardInSd = FALSE;
             }
+//            else {
+//                 cardInSd = FALSE;
+//             }
         }