Merge pull request #272 from ThKattanek/issue#271

ThKattanek · web-flow · commit c9a790a8f16a · 2025-06-26T06:57:38.000+02:00
#271 Fixed export prg from d64 image
diff --git a/src/d64_class.cpp b/src/d64_class.cpp
@@ -116,11 +116,12 @@ bool D64Class::ExportPrg(int file_number, const char *filename)
     uint8_t current_track = d64_files[file_number].Track;
     uint8_t current_sector = d64_files[file_number].Sektor;
 
-    while(current_track != 0)
+    while(current_track != 0 && block_count > 0)
     {
         ReadBlock(current_track, current_sector, block);
         current_track = block[0];
         current_sector = block[1];
+        block_count--;
         if(current_track == 0) fwrite(block+2, 1, current_sector - 1, file);
         else fwrite(block+2, 1, 254, file);
     }

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,12 @@ bool D64Class::ExportPrg(int file_number, const char *filename)`
`116`	`116`	`uint8_t current_track = d64_files[file_number].Track;`
`117`	`117`	`uint8_t current_sector = d64_files[file_number].Sektor;`
`118`	`118`
`119`		`- while(current_track != 0)`
	`119`	`+ while(current_track != 0 && block_count > 0)`
`120`	`120`	`{`
`121`	`121`	`ReadBlock(current_track, current_sector, block);`
`122`	`122`	`current_track = block[0];`
`123`	`123`	`current_sector = block[1];`
	`124`	`+ block_count--;`
`124`	`125`	`if(current_track == 0) fwrite(block+2, 1, current_sector - 1, file);`
`125`	`126`	`else fwrite(block+2, 1, 254, file);`
`126`	`127`	`}`