From e465c16091efb7231e897c653b47be42bc356c4c Mon Sep 17 00:00:00 2001 From: alcexhim Date: Sat, 13 Jun 2015 23:39:20 -0400 Subject: [PATCH] Ignore directory entries for now, and only load for FileSystemObjectModels --- .../DataFormats/FileSystem/FAT/FATDataFormat.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs index afea273b..508241c6 100644 --- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs +++ b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs @@ -100,8 +100,10 @@ namespace UniversalEditor.DataFormats.FileSystem.FAT protected override void LoadInternal(ref ObjectModel objectModel) { FileSystemObjectModel fsom = (objectModel as FileSystemObjectModel); - IO.Reader br = base.Accessor.Reader; + if (fsom == null) throw new ObjectModelNotSupportedException(); + IO.Reader br = base.Accessor.Reader; + mvarJumpInstruction = br.ReadBytes(3); mvarOEMName = br.ReadFixedLengthString(8); @@ -550,6 +552,7 @@ namespace UniversalEditor.DataFormats.FileSystem.FAT */ byte[] reserved = br.ReadBytes(10); + short timeCreatedOrLastUpdated = br.ReadInt16(); short dateCreatedOrLastUpdated = br.ReadInt16(); short startingClusterNumber = br.ReadInt16(); @@ -578,7 +581,11 @@ namespace UniversalEditor.DataFormats.FileSystem.FAT { fi.Attributes |= FileAttributes.Deleted; } - fileInfos.Add(fi); + + if (!((fileAttributes & FATFileAttributes.Subdirectory) == FATFileAttributes.Subdirectory)) + { + fileInfos.Add(fi); + } } } }