summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-20 21:10:44 (UTC)
committer llornkcor <llornkcor>2002-10-20 21:10:44 (UTC)
commit5696ac7a408c826c1e62f2200f6209a2c3d95119 (patch) (unidiff)
tree0b1f6e4b6e96331abf380ae371aa8021c6045f33
parentd5433091ba9741f0fae104d038b906e353065e2d (diff)
downloadopie-5696ac7a408c826c1e62f2200f6209a2c3d95119.zip
opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.tar.gz
opie-5696ac7a408c826c1e62f2200f6209a2c3d95119.tar.bz2
fix for sd/cf double whammy insert/eject on resume
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp6
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
@@ -264,6 +264,7 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
264bool CardMonitor::getStatusSd( int showPopUp ) { 264bool CardMonitor::getStatusSd( int showPopUp ) {
265 265
266 bool cardWas = cardInSd; // remember last state 266 bool cardWas = cardInSd; // remember last state
267 cardInSd = FALSE;
267 268
268#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 269#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
269 struct mntent *me; 270 struct mntent *me;
@@ -276,9 +277,10 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
276 if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) { 277 if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" || fs.left( 9 ) == "/dev/mmcd" ) {
277 cardInSd = TRUE; 278 cardInSd = TRUE;
278 show(); 279 show();
279 } else {
280 cardInSd = FALSE;
281 } 280 }
281// else {
282// cardInSd = FALSE;
283// }
282 } 284 }
283 endmntent( mntfp ); 285 endmntent( mntfp );
284 } 286 }