td0: Fix flag handling for images with per-track is_fm flag

Also fix another misuse of Python logical operator with non-boolean argument elsewhere in the code base.
keirf · Jun 14, 2024 · 4022500 · 4022500
1 parent f30023c
commit 4022500
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/greaseweazle/image/scp.py b/src/greaseweazle/image/scp.py
@@ -153,7 +153,7 @@ def from_bytes(self, dat: bytes) -> None:
         if sum(dat[16:]) & 0xffffffff != checksum:
             print('SCP: WARNING: Bad image checksum')
 
-        index_cued = flags & 1 or nr_revs == 1
+        index_cued = (flags & 1) == 1 or nr_revs == 1
 
         # Some tools generate a short TLUT. We handle this by truncating the
         # TLUT at the first Track Data Header.

diff --git a/src/greaseweazle/image/td0.py b/src/greaseweazle/image/td0.py
@@ -69,7 +69,7 @@ def from_bytes(self, dat: bytes) -> None:
                         'TD0: bad track header crc')
             off += 4
 
-            track_is_fm = (head & 128) or global_is_fm
+            track_is_fm = (head & 128) == 128 or global_is_fm
             head &= 127
 
             fmt = ibm.IBMTrack_FixedDef(['ibm.mfm','ibm.fm'][track_is_fm])