Fix extractions recent header changes

Author: damieng

Source/DiskImageManager.res

@@ -372,7 +372,7 @@ object frmMain: TfrmMain
       Caption = 'Copy details to clipboard'
       OnClick = itmEditCopyClick
     end
-    object Separator2: TMenuItem
+    object itmCopySep: TMenuItem
       Caption = '-'
     end
     object itmSaveFileAs: TMenuItem
@@ -383,7 +383,7 @@ object frmMain: TfrmMain
       Caption = 'Save file with header as...'
       OnClick = itmSaveFileWithHeaderAsClick
     end
-    object Separator3: TMenuItem
+    object itmSaveFileSep: TMenuItem
       Caption = '-'
     end
     object itmSaveSelectedFilesTo: TMenuItem

Source/Main.lfm

@@ -51,8 +51,8 @@   TfrmMain = class(TForm)
     dlgSaveBinary: TSaveDialog;
     dlgSelectDirectory: TSelectDirectoryDialog;
     Separator1: TMenuItem;
-    Separator2: TMenuItem;
-    Separator3: TMenuItem;
+    itmCopySep: TMenuItem;
+    itmSaveFileSep: TMenuItem;
     splVertical: TSplitter;
     staBar: TStatusBar;
     pnlRight: TPanel;
@@ -343,6 +343,8 @@ procedure TfrmMain.popListItemPopup(Sender: TObject);
     itmSaveFileAs.Caption := Format('Save %s as...', [DiskFile.FileName]);
     itmSaveFileWithHeaderAs.Caption := Format('Save %s with header as...', [DiskFile.FileName]);
   end;
+
+  itmSaveFileSep.Visible:= itmSaveFileWithHeaderAs.Visible and itmSaveSelectedFilesTo.Visible;
 end;
 
 function TfrmMain.FindTreeNodeFromData(Node: TTreeNode; Data: TObject): TTreeNode;

Source/Main.pas

@@ -334,7 +334,7 @@ function TDSKFile.GetData(WithHeader: boolean): TDiskByteArray;
   FileData: TDiskByteArray;
 begin
   FileData := nil;
-  SetLength(FileData, Size);
+  SetLength(FileData, Size + HeaderSize);
 
   BytesLeft := Size + HeaderSize;
   TargetIdx := 0;
@@ -372,7 +372,7 @@ function TDSKFile.GetData(WithHeader: boolean): TDiskByteArray;
   if (not WithHeader) and ((HeaderType = 'PLUS3DOS') or (HeaderType = 'AMSDOS')) then
     Result := Copy(FileData, HeaderSize, Size - HeaderSize)
   else
-    Result := Copy(FileData, Size);
+    Result := Copy(FileData, 0, Size);
 end;
 
 end.