The 1581 ROM name will now be displayed on the LCD when in 1581 mode.

This commit is contained in:
Stephen White 2019-12-30 18:42:51 +11:00
parent 35bc99d7c6
commit 2c4629bca6

View file

@ -344,6 +344,8 @@ void DiskCaddy::Display()
void DiskCaddy::ShowSelectedImage(u32 index) void DiskCaddy::ShowSelectedImage(u32 index)
{ {
DiskImage* image = GetImage(index);
u32 x; u32 x;
u32 y; u32 y;
#if not defined(EXPERIMENTALZERO) #if not defined(EXPERIMENTALZERO)
@ -351,7 +353,6 @@ void DiskCaddy::ShowSelectedImage(u32 index)
{ {
x = screen->ScaleX(screenPosXCaddySelections); x = screen->ScaleX(screenPosXCaddySelections);
y = screen->ScaleY(screenPosYCaddySelections) + 16 + 16 * index; y = screen->ScaleY(screenPosYCaddySelections) + 16 + 16 * index;
DiskImage* image = GetImage(index);
const char* name = image->GetName(); const char* name = image->GetName();
if (name) if (name)
{ {
@ -377,7 +378,7 @@ void DiskCaddy::ShowSelectedImage(u32 index)
, index + 1 , index + 1
, numberOfImages , numberOfImages
, GetImage(index)->GetReadOnly() ? 'R' : ' ' , GetImage(index)->GetReadOnly() ? 'R' : ' '
, roms ? roms->GetSelectedROMName() : "" , roms ? (image->IsD81() ? roms->ROMName1581 : roms->GetSelectedROMName()) : ""
); );
screenLCD->PrintText(false, x, y, buffer, 0, RGBA(0xff, 0xff, 0xff, 0xff)); screenLCD->PrintText(false, x, y, buffer, 0, RGBA(0xff, 0xff, 0xff, 0xff));
y += screenLCD->GetFontHeight(); y += screenLCD->GetFontHeight();