Merge pull request #605 from tdaede/fix_physical_sector_ordering

D88/NFD: Add physical layout before adding sector.

Author: davidgiven

lib/imagereader/d88imagereader.cc

@@ -190,11 +190,10 @@ class D88ImageReader : public ImageReader
                 }
                 Bytes data(sectorSize);
                 inputFile.read((char*)data.begin(), data.size());
+                physical->add_sector(sectorId);
                 const auto& sector = image->put(track, head, sectorId);
                 sector->status = Sector::OK;
                 sector->data = data;
-
-                physical->add_sector(sectorId);
             }
 
             if (mediaFlag != 0x20)

lib/imagereader/nfdimagereader.cc

@@ -144,11 +144,10 @@ class NFDImageReader : public ImageReader
                 }
                 Bytes data(sectorSize);
                 inputFile.read((char*)data.begin(), data.size());
+                physical->add_sector(sectorId);
                 const auto& sector = image->put(track, head, sectorId);
                 sector->status = Sector::OK;
                 sector->data = data;
-
-                physical->add_sector(sectorId);
             }
         }