3
3
using System . Linq ;
4
4
using System . Text ;
5
5
6
+ using BizHawk . Common . StringExtensions ;
6
7
using BizHawk . Emulation . Common ;
7
8
using BizHawk . Emulation . Cores . Waterbox ;
8
9
@@ -55,6 +56,7 @@ public partial class UAE : WaterboxCore
55
56
private bool _nextDrivePressed ;
56
57
private int _correctedWidth ;
57
58
private string _chipsetCompatible = "" ;
59
+ private string GetFullName ( IRomAsset rom ) => Path . GetFileName ( rom . RomPath . SubstringAfter ( '|' ) ) ;
58
60
59
61
public override int VirtualWidth => _correctedWidth ;
60
62
@@ -218,7 +220,7 @@ protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController contro
218
220
}
219
221
else
220
222
{
221
- CoreComm . Notify ( $ "Ejected drive FD{ _currentDrive } : { Path . GetFileName ( _roms [ _driveSlots [ _currentDrive ] ] . RomPath ) } ", _messageDuration ) ;
223
+ CoreComm . Notify ( $ "Ejected drive FD{ _currentDrive } : { GetFullName ( _roms [ _driveSlots [ _currentDrive ] ] ) } ", _messageDuration ) ;
222
224
_driveSlots [ _currentDrive ] = _driveNullOrEmpty ;
223
225
}
224
226
}
@@ -240,7 +242,7 @@ protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController contro
240
242
}
241
243
}
242
244
_driveSlots [ _currentDrive ] = _currentSlot ;
243
- CoreComm . Notify ( $ "Insterted drive FD{ _currentDrive } : { Path . GetFileName ( _roms [ _driveSlots [ _currentDrive ] ] . RomPath ) } ", _messageDuration ) ;
245
+ CoreComm . Notify ( $ "Insterted drive FD{ _currentDrive } : { GetFullName ( _roms [ _driveSlots [ _currentDrive ] ] ) } ", _messageDuration ) ;
244
246
}
245
247
}
246
248
@@ -251,7 +253,7 @@ protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController contro
251
253
_currentSlot ++ ;
252
254
_currentSlot %= _roms . Count ;
253
255
var selectedFile = _roms [ _currentSlot ] ;
254
- CoreComm . Notify ( $ "Selected slot { _currentSlot } : { Path . GetFileName ( selectedFile . RomPath ) } ", _messageDuration ) ;
256
+ CoreComm . Notify ( $ "Selected slot { _currentSlot } : { GetFullName ( selectedFile ) } ", _messageDuration ) ;
255
257
}
256
258
}
257
259
@@ -268,7 +270,7 @@ protected override LibWaterboxCore.FrameInfo FrameAdvancePrep(IController contro
268
270
}
269
271
else
270
272
{
271
- name = Path . GetFileName ( _roms [ _driveSlots [ _currentDrive ] ] . RomPath ) ;
273
+ name = GetFullName ( _roms [ _driveSlots [ _currentDrive ] ] ) ;
272
274
}
273
275
CoreComm . Notify ( $ "Selected drive FD{ _currentDrive } : { name } ", _messageDuration ) ;
274
276
}
0 commit comments