Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2024-11-30 23:49:52 +00:00
Code Issues 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

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

@ -129,6 +129,7 @@ public class CardMassStorage extends Card implements MediaConsumerParent {
@Override @Override
public void reconfigure() { public void reconfigure() {
unregisterListeners(); unregisterListeners();
if (computer.getCpu() != null) {
int pc = computer.getCpu().getProgramCounter(); int pc = computer.getCpu().getProgramCounter();
if (drive1.getCurrentDisk() != null && getSlot() == 7 && (pc >= 0x0c65e && pc <= 0x0c66F)) { 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 // If the computer is in a loop trying to boot from cards 6, fast-boot from here instead
@ -136,6 +137,7 @@ public class CardMassStorage extends Card implements MediaConsumerParent {
currentDrive = drive1; currentDrive = drive1;
EmulatorUILogic.simulateCtrlAppleReset(); EmulatorUILogic.simulateCtrlAppleReset();
} }
}
registerListeners(); registerListeners();
} }