Merge pull request #145 from kk49/develop

v0.2.17
kk49 · Feb 2, 2023 · 484adc2 · 484adc2
2 parents 3ff8662 + f0dface
commit 484adc2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+#### v0.2.17 can't sleep, hotfix time
+* Fixed bug with loading because of ADF5 type discovery (https://github.com/kk49/deca/issues/144)
+
 #### v0.2.16 what would it be like to be a raven? 
 * Support for processing of uncompressed COTW ADF save files
 * Sped up display of large files that display text

diff --git a/python/deca/deca/ff_determine.py b/python/deca/deca/ff_determine.py
@@ -50,7 +50,7 @@ def determine_file_type_and_size(f, file_size0):
             file_type = FTYPE_ADF
         elif b'\x00FDA' == magic[0:4]:
             file_type = FTYPE_ADF0
-        elif b'\x01\x01\x00\x00\x00 FDA':
+        elif b'\x01\x01\x00\x00\x00 FDA' == magic[0:19]:
             file_type = FTYPE_ADF5
         elif b'AVTX' == magic[0:4]:
             file_type = FTYPE_AVTX

diff --git a/python/deca_gui/deca_gui/main.py b/python/deca_gui/deca_gui/main.py
@@ -19,7 +19,7 @@
 from PySide2.QtGui import QDesktopServices, QKeyEvent
 
 
-window_title = 'decaGUI: v0.2.16'
+window_title = 'decaGUI: v0.2.17'
 
 
 class MainWindowDataSource(IVfsViewSrc):