diff options
author | 2019-08-25 20:20:24 -0400 | |
---|---|---|
committer | 2019-08-25 20:20:24 -0400 | |
commit | b9d0daa821d17e96064d92fd6df296a5824cdb4b (patch) | |
tree | b3a6913b01c07b27dba1b8adcca3774e84bceafa | |
parent | a40bc736e7343336035b96b2c5224e55a09498b2 (diff) | |
parent | 9d1b6f11a6f0ef98511787f0836bfe6ef9450630 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | hash/gjmovie.xml | 3 | ||||
-rw-r--r-- | src/lib/formats/flex_dsk.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hash/gjmovie.xml b/hash/gjmovie.xml index 4123bd85c68..09270afe44a 100644 --- a/hash/gjmovie.xml +++ b/hash/gjmovie.xml @@ -2,10 +2,13 @@ <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd"> <softwarelist name="gjmovie" description="VTech Genius Junior Movie cartridges"> +<!-- According to the boxart, this is compatible with: Junior Movie/Leader Movie + A (later) sticker says compatibility extends to Leader Action --> <software name="wuz" supported="no"> <description>Wort-und Zahlenspaß</description> <year>1993</year> <publisher>VTech</publisher> + <info name="serial" value="80-1883" /> <part name="rom" interface="genius_cart"> <dataarea name="rom" size="0x40000"> <rom name="27-5364-00.u6" size="0x40000" crc="203f0461" sha1="dfc8bb341f703c5f018a7222c24d4a2195316387"/> diff --git a/src/lib/formats/flex_dsk.cpp b/src/lib/formats/flex_dsk.cpp index cb2dbb33b12..0d4aa038e60 100644 --- a/src/lib/formats/flex_dsk.cpp +++ b/src/lib/formats/flex_dsk.cpp @@ -91,8 +91,8 @@ int flex_format::find_size(io_generic *io, uint32_t form_factor) } if (info.disk_ext[0] || info.disk_ext[1] || info.disk_ext[2]) { LOG_FORMATS("."); - for (int i = 0; i < sizeof(info.disk_name); i++) { - uint8_t ch = info.disk_name[i]; + for (int i = 0; i < sizeof(info.disk_ext); i++) { + uint8_t ch = info.disk_ext[i]; if (ch < 0x20 || ch > 0x7f) { LOG_FORMATS("[%02x]", ch); } else { |