From 19c68edadb5651dae82c4013a7d96315d72d3e47 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brendan.robert@gmail.com>
Date: Wed, 1 Jan 2020 18:56:30 -0600
Subject: [PATCH] Updated Jace emulator to allow HD images as well as 800kb
 floppy images

---
 OutlawEditor/.gitignore                                |  3 +++
 .../jace/src/main/java/jace/apple2e/MOS65C02.java      |  5 +++++
 .../tools/jace/src/main/java/jace/apple2e/Speaker.java | 10 +++++++---
 .../Apple/tools/jace/src/main/java/jace/core/Card.java |  2 +-
 .../src/main/java/jace/lawless/LawlessImageTool.java   |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/OutlawEditor/.gitignore b/OutlawEditor/.gitignore
index aeaec0f7..47ff4e0f 100644
--- a/OutlawEditor/.gitignore
+++ b/OutlawEditor/.gitignore
@@ -1 +1,4 @@
 /*~
+/nb-configuration.xml
+/OutlawEditor.iml
+/.idea/
\ No newline at end of file
diff --git a/Platform/Apple/tools/jace/src/main/java/jace/apple2e/MOS65C02.java b/Platform/Apple/tools/jace/src/main/java/jace/apple2e/MOS65C02.java
index 55cebac3..98d7f110 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/apple2e/MOS65C02.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/apple2e/MOS65C02.java
@@ -1379,4 +1379,9 @@ public class MOS65C02 extends CPU {
             default:
         }
     }
+
+    @Override
+    public void reconfigure() {
+        // Currently do nothing
+    }
 }
diff --git a/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Speaker.java b/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Speaker.java
index 5579da6e..7af09278 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Speaker.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/apple2e/Speaker.java
@@ -152,11 +152,15 @@ public class Speaker extends SoundGeneratorDevice {
     @Override
     public boolean suspend() {
         boolean result = super.suspend();
-        playbackTimer.cancel();
+        if (playbackTimer != null) {
+            playbackTimer.cancel();
+        }
         speakerBit = false;
         sdl = null;
-        computer.getMotherboard().cancelSpeedRequest(this);
-        computer.mixer.returnLine(this);
+        if (computer.getMotherboard() != null) {
+            computer.getMotherboard().cancelSpeedRequest(this);
+            computer.mixer.returnLine(this);
+        }
 
         return result;
     }
diff --git a/Platform/Apple/tools/jace/src/main/java/jace/core/Card.java b/Platform/Apple/tools/jace/src/main/java/jace/core/Card.java
index 15bf866c..216c8590 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/core/Card.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/core/Card.java
@@ -101,7 +101,7 @@ public abstract class Card extends Device {
 
     @Override
     public void reconfigure() {
-        super.reconfigure();
+        //super.reconfigure();
         boolean restart = suspend();
         unregisterListeners();
         if (restart) {
diff --git a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessImageTool.java b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessImageTool.java
index b4f53ac8..3fbf6a9a 100644
--- a/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessImageTool.java
+++ b/Platform/Apple/tools/jace/src/main/java/jace/lawless/LawlessImageTool.java
@@ -71,7 +71,7 @@ public class LawlessImageTool implements MediaConsumer {
 
     @Override
     public boolean isAccepted(MediaEntry e, MediaEntry.MediaFile f) {
-        return e.type == DiskType.FLOPPY800;
+        return e.type == DiskType.FLOPPY800 || e.type == DiskType.LARGE;
     }
 
     @Override