[#72] Dumping (Part 7: Fixed iteration over unknown number of revolut…

…ions, e.g. internal FDD)
tomas-nestorovic · Feb 25, 2022 · 0ccb68f · 0ccb68f
1 parent 7436663
commit 0ccb68f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Main/src/FDD.cpp b/Main/src/FDD.cpp
@@ -879,7 +879,7 @@ error:				switch (const TStdWinError err=::GetLastError()){
 				}
 			}
 			// . executing the above composed Plan
-			const bool silentlyRecoverFromErrors=rev>=Revolution::ANY_GOOD;
+			const bool silentlyRecoverFromErrors=rev>=Revolution::NEXT;
 			for( const TPlanStep *pPlanStep=plan; pPlanStep<planEnd; pPlanStep++ ){
 				TInternalTrack::TSectorInfo *const psi=pPlanStep->psi;
 				const BYTE index=pPlanStep->indexIntoOutputBuffers;

diff --git a/Main/src/Image_Dump.cpp b/Main/src/Image_Dump.cpp
@@ -529,10 +529,14 @@
 						LOG_SECTOR_ACTION(&p.chs.sectorId,_T("reading"));
 						if (sPrev!=p.s) // is this the first trial?
 							p.revolution=Revolution::R0;
-						else if (dp.source->GetAvailableRevolutionCount()<=Revolution::MAX) // is the # of Revolutions limited?
+						else if (dp.source->GetAvailableRevolutionCount()<=Revolution::MAX){ // is the # of Revolutions limited?
 							if (++p.revolution>=dp.source->GetAvailableRevolutionCount())
 								p.revolution=Revolution::R0;
-						bufferSectorData[p.s]=dp.source->GetSectorData( p.chs, p.s, (Revolution::TType)p.revolution, bufferLength+p.s, bufferFdcStatus+p.s );
+							bufferSectorData[p.s]=dp.source->GetSectorData( p.chs, p.s, (Revolution::TType)p.revolution, bufferLength+p.s, bufferFdcStatus+p.s );
+						}else{
+							++p.revolution;
+							bufferSectorData[p.s]=dp.source->GetSectorData( p.chs, p.s, Revolution::NEXT, bufferLength+p.s, bufferFdcStatus+p.s );
+						}
 						// | showing the Dialog and processing its result
 						LOG_DIALOG_DISPLAY(_T("CErroneousSectorDialog"));
 						switch (LOG_DIALOG_RESULT(d.DoModal())){