author | llornkcor <llornkcor> | 2002-10-20 21:10:44 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-20 21:10:44 (UTC) |
commit | 5696ac7a408c826c1e62f2200f6209a2c3d95119 (patch) (side-by-side diff) | |
tree | 0b1f6e4b6e96331abf380ae371aa8021c6045f33 /core | |
parent | d5433091ba9741f0fae104d038b906e353065e2d (diff) | |
download | opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.zip opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.tar.gz opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.tar.bz2 |
fix for sd/cf double whammy insert/eject on resume
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 6 |
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 @@ -263,8 +263,9 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { 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" ); @@ -275,11 +276,12 @@ bool CardMonitor::getStatusSd( int showPopUp ) { //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 ); } |