zjkuki/jace
1
0
Fork 0
forked from Apple-2-Tools/jace
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure CPU exists on computer object before trying to use it

Browse Source
This commit is contained in:
Brendan Robert 2015-03-30 00:29:47 -05:00
parent 430ab4e4de
commit 3bca1f29c0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/jace/hardware/massStorage/CardMassStorage.java
View File

@ -129,12 +129,14 @@ public class CardMassStorage extends Card implements MediaConsumerParent {
@Override
public void reconfigure() {
unregisterListeners();
int pc = computer.getCpu().getProgramCounter();
if (drive1.getCurrentDisk() != null && getSlot() == 7 && (pc >= 0x0c65e && pc <= 0x0c66F)) {
// If the computer is in a loop trying to boot from cards 6, fast-boot from here instead
// This is a convenience to boot a hard-drive if the emulator has started waiting for a currentDisk
currentDrive = drive1;
EmulatorUILogic.simulateCtrlAppleReset();
if (computer.getCpu() != null) {
int pc = computer.getCpu().getProgramCounter();
if (drive1.getCurrentDisk() != null && getSlot() == 7 && (pc >= 0x0c65e && pc <= 0x0c66F)) {
// If the computer is in a loop trying to boot from cards 6, fast-boot from here instead
// This is a convenience to boot a hard-drive if the emulator has started waiting for a currentDisk
currentDrive = drive1;
EmulatorUILogic.simulateCtrlAppleReset();
}
}
registerListeners();
}