Skip to content

Commit 63bd1a6

Browse files
committed
Merge 'fix: _MACOSX directory in ootr archive can cause issues loading tracks' (#2300)
2 parents 4b05ee9 + 7229999 commit 63bd1a6

3 files changed

Lines changed: 4 additions & 1 deletion

File tree

MusicHelpers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ def process_sequence_ootrs(filepath: str, file_name: str, seq_type: str, include
122122
zbank_file = None
123123
bankmeta_file = None
124124
for f in zip.namelist():
125+
if '/' in f: # Only read files in the root of the archive
126+
continue
125127
if f.endswith(".meta"):
126128
meta_file = f
127129
continue

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
126126
* Fix a crash when pressing down on the D-pad on the inventory screen in some settings combinations.
127127
* Fix a possible void out at the Forest Temple boss door.
128128
* Fix importing settings from older versions on web.
129+
* Fix a Mac-specific issue when loading track .meta files.
129130

130131
#### New Speedups
131132
* The first text box from each carpenter in the Thieves' Hideout is skipped.

version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '8.2.32'
1+
__version__ = '8.2.33'
22

33
# This is a supplemental version number for branches based off of main dev.
44
supplementary_version = 0

0 commit comments

Comments
 (0)