From f1e6db038bf7f5a8822024c80480752da82d830a Mon Sep 17 00:00:00 2001
From: Marcio T <mlt4356-github@yahoo.com>
Date: Fri, 26 Nov 2021 20:05:41 -0700
Subject: [PATCH] Additional fixes.

---
 mac-cpp-source/Iomega Tester.cpp | 1 +
 mac-cpp-source/tip/tip_aspi.cpp  | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/mac-cpp-source/Iomega Tester.cpp b/mac-cpp-source/Iomega Tester.cpp
index 47a6275..b9c926c 100644
--- a/mac-cpp-source/Iomega Tester.cpp	
+++ b/mac-cpp-source/Iomega Tester.cpp	
@@ -74,6 +74,7 @@ void confirm_run_tip(int id) {
     if(tolower(cmd[0]) == 'y') {
         run_tip(id);
     }
+    printf("\n\nYou may need to REBOOT your Mac before cartridges are recognized by Mac OS.");
 }
 
 void print_help() {
diff --git a/mac-cpp-source/tip/tip_aspi.cpp b/mac-cpp-source/tip/tip_aspi.cpp
index 4120d5f..9fbf58a 100644
--- a/mac-cpp-source/tip/tip_aspi.cpp
+++ b/mac-cpp-source/tip/tip_aspi.cpp
@@ -514,12 +514,19 @@ void SetCartridgeStatusToEAX(long eax) {
     long PriorStatus = CartridgeStatus;
     CartridgeStatus = eax;
 
+    if (!DriveCount) {
+        // MLT: Added this check.
+        SetRichEditText(szASPITrouble);
+        goto DisableActions;
+    }
+
     // Set the text of the "action initiate button"
     const char *esi = 0;
     switch (CartridgeStatus) {
         case DISK_SPUN_DOWN:
             // set the button to "Start Disk Spinning"
             esi = szPressToSpin;
+            EnableWindow(hTestButton, true);
             break;
         case DISK_TEST_UNDERWAY:
             // set the button to "Stop Testing"