From: <ck...@us...> - 2004-02-21 10:44:23
|
Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18667/krusader_kde3/krusader/MountMan Modified Files: kmountman.cpp Log Message: FIXED: MountMan df waiting timeout is 30 sec instead of 5 s (slow devices) Index: kmountman.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** kmountman.cpp 7 Feb 2004 12:56:09 -0000 1.17 --- kmountman.cpp 21 Feb 2004 10:32:27 -0000 1.18 *************** *** 58,61 **** --- 58,63 ---- #endif + #define DF_WAIT_TIME 30 + bool dfStartFailed = false; *************** *** 292,297 **** SLOT(finishUpdateFilesystems())); dfProc.start(KProcess::NotifyOnExit); ! // if 'df' doesn't return in 5 seconds, stop mountman ! QTimer::singleShot(5*1000,this,SLOT(killMountMan())); } --- 294,299 ---- SLOT(finishUpdateFilesystems())); dfProc.start(KProcess::NotifyOnExit); ! // if 'df' doesn't return in DF_WAIT_TIME seconds, stop mountman ! QTimer::singleShot(DF_WAIT_TIME*1000,this,SLOT(killMountMan())); } *************** *** 755,759 **** KProcessController::theKProcessController->waitForProcessExit(1); ! if( ::time(0) - startTime > 5 ) { dfProc.kill(SIGKILL); // kill the process --- 757,761 ---- KProcessController::theKProcessController->waitForProcessExit(1); ! if( ::time(0) - startTime > DF_WAIT_TIME ) { dfProc.kill(SIGKILL); // kill the process |