Updated to 1.38.4

Documentation/Changes.txt

@@ -754,6 +754,7 @@ Bug fixes
 New or improved features
 * When the root directory is selected, the 'Directory Title' field now reads 'Disc Title' and changing the text will update the disc title of the image, instead of failing with Acorn DFS.
 * The Display Free Space button's hint text has been changed to 'View/Edit Image Details' to more accurately reflect the dialogue box.
+* Extended the ADFS interleave options beyond ADFS 'L'. Forcing an interleave option will use that option for any ADFS format, not just 'L'.
 
 Bug fixes
 * Temporarily removed the 'file goes over disc edge' checks as some valid images were not getting opened.

LazarusSource/DiscImage.pas

@@ -1,7 +1,7 @@
 unit DiscImage;
 
 {
-TDiscImage class V1.38.1
+TDiscImage class V1.38.4
 Manages retro disc images, presenting a list of files and directories to the
 parent application. Will also extract files and write new files. Almost a complete
 filing system in itself. Compatible with Acorn DFS, Acorn ADFS, UEF, Commodore

LazarusSource/DiscImageManager.lpi

@@ -20,9 +20,9 @@
       <UseVersionInfo Value="True"/>
       <MajorVersionNr Value="1"/>
       <MinorVersionNr Value="38"/>
-      <RevisionNr Value="3"/>
+      <RevisionNr Value="4"/>
       <Language Value="0809"/>
-      <StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.38.3"/>
+      <StringTable CompanyName="GJH Software" FileDescription="Disc Image Manager for Acorn and Commodore disc formats" ProductName="Disc Image Manager" ProductVersion="1.38.4"/>
     </VersionInfo>
     <BuildModes Count="6">
       <Item1 Name="Default" Default="True"/>

LazarusSource/DiscImageManager.lps

@@ -30,8 +30,7 @@
         <Filename Value="DiscImage.pas"/>
         <IsPartOfProject Value="True"/>
         <EditorIndex Value="11"/>
-        <TopLine Value="436"/>
-        <CursorPos X="12" Y="456"/>
+        <CursorPos X="25" Y="4"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -264,8 +263,8 @@
       <Unit22>
         <Filename Value="DiscImage_ADFS.pas"/>
         <EditorIndex Value="15"/>
-        <TopLine Value="461"/>
-        <CursorPos X="2" Y="485"/>
+        <TopLine Value="1037"/>
+        <CursorPos X="60" Y="824"/>
         <UsageCount Value="102"/>
         <Loaded Value="True"/>
       </Unit22>
@@ -349,8 +348,8 @@
       <Unit33>
         <Filename Value="DiscImage_Private.pas"/>
         <EditorIndex Value="12"/>
-        <TopLine Value="162"/>
-        <CursorPos X="16" Y="187"/>
+        <TopLine Value="438"/>
+        <CursorPos X="44" Y="453"/>
         <UsageCount Value="119"/>
         <Loaded Value="True"/>
       </Unit33>
@@ -377,7 +376,7 @@
         <UsageCount Value="10"/>
       </Unit36>
     </Units>
-    <JumpHistory Count="11" HistoryIndex="10">
+    <JumpHistory Count="17" HistoryIndex="16">
       <Position1>
         <Filename Value="DiscImage.pas"/>
         <Caret Line="453" Column="12" TopLine="448"/>
@@ -422,6 +421,30 @@
         <Filename Value="MainUnit.pas"/>
         <Caret Line="4496" Column="2" TopLine="4492"/>
       </Position11>
+      <Position12>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="160" Column="12" TopLine="139"/>
+      </Position12>
+      <Position13>
+        <Filename Value="DiscImage_Private.pas"/>
+        <Caret Line="430" Column="12" TopLine="410"/>
+      </Position13>
+      <Position14>
+        <Filename Value="DiscImage_Private.pas"/>
+        <Caret Line="430" Column="12" TopLine="410"/>
+      </Position14>
+      <Position15>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="162" Column="12" TopLine="147"/>
+      </Position15>
+      <Position16>
+        <Filename Value="DiscImage_ADFS.pas"/>
+        <Caret Line="485" Column="2" TopLine="311"/>
+      </Position16>
+      <Position17>
+        <Filename Value="DiscImage.pas"/>
+        <Caret Line="162" Column="12" TopLine="147"/>
+      </Position17>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

LazarusSource/DiscImage_Private.pas

@@ -449,8 +449,10 @@ function TDiscImage.DiscAddrToIntOffset(disc_addr: Cardinal): Cardinal;
  oldheads = 2;
 begin
  Result:=disc_addr;
+ if(FForceInter=0)and(FFormat>>4=diAcornADFS)then
+  if(FFormat<>diAcornADFS<<4+$02)then exit;
  //ADFS L or AFS with 'INT' option
- if((FFormat=diAcornADFS<<4+$02)or(FFormat>>4=diAcornFS))
+ if((FFormat>>4=diAcornADFS{<<4+$02})or(FFormat>>4=diAcornFS))
  and(Finterleave>1)then
  begin
   //Variables not set, then set them to default

LazarusSource/MainUnit.pas

@@ -508,7 +508,7 @@   TMainForm = class(TForm)
     DesignedDPI = 96;
     //Application Title
     ApplicationTitle   = 'Disc Image Manager';
-    ApplicationVersion = '1.38.3';
+    ApplicationVersion = '1.38.4';
     //Current platform and architecture (compile time directive)
     {$IFDEF Darwin}
     platform = 'macOS';            //Apple Mac OS X