From e6594514efdddcfcd281472a2fdf896971429663 Mon Sep 17 00:00:00 2001 From: Brendan Robert Date: Sun, 22 May 2016 16:25:42 -0500 Subject: [PATCH] Fixed recursive death bug for new commandline feature -- confirmed that HDV/2MG disks can be inserted via CMD options now. --- src/main/java/jace/hardware/massStorage/CardMassStorage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/jace/hardware/massStorage/CardMassStorage.java b/src/main/java/jace/hardware/massStorage/CardMassStorage.java index da8a196..c3038d1 100644 --- a/src/main/java/jace/hardware/massStorage/CardMassStorage.java +++ b/src/main/java/jace/hardware/massStorage/CardMassStorage.java @@ -139,8 +139,8 @@ public class CardMassStorage extends Card implements MediaConsumerParent { if (disk1 != null && !disk1.isEmpty()) { try { MediaEntry entry = MediaCache.getMediaFromFile(new File(disk1)); - drive1.insertMedia(entry, entry.files.get(0)); disk1 = null; + drive1.insertMedia(entry, entry.files.get(0)); } catch (IOException ex) { Logger.getLogger(CardMassStorage.class.getName()).log(Level.SEVERE, null, ex); } @@ -148,8 +148,8 @@ public class CardMassStorage extends Card implements MediaConsumerParent { if (disk2 != null && !disk2.isEmpty()) { try { MediaEntry entry = MediaCache.getMediaFromFile(new File(disk2)); - drive2.insertMedia(entry, entry.files.get(0)); disk2 = null; + drive2.insertMedia(entry, entry.files.get(0)); } catch (IOException ex) { Logger.getLogger(CardMassStorage.class.getName()).log(Level.SEVERE, null, ex); }