From fc13777211448020782d36094cb18e1ccb492145 Mon Sep 17 00:00:00 2001
From: Denny Sheirer <dennissheirer2002@yahoo.com>
Date: Sun, 19 Feb 2023 10:18:19 -0500
Subject: [PATCH] #1456 Resolves issue with shutdown when no sdrplay api is
 available. Version update to 0.6.0 alpha-2 (#1457)

Co-authored-by: Dennis Sheirer <dsheirer@github.com>
---
 build.gradle                                  |  2 +-
 .../source/tuner/sdrplay/api/SDRplay.java     | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index e86a6264..69cd2343 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 
-version = '0.6.0-alpha1'
+version = '0.6.0-alpha2'
 
 //Java 19 is required for this version of the Project Panama preview/incubator feature
 java {
diff --git a/src/main/java/io/github/dsheirer/source/tuner/sdrplay/api/SDRplay.java b/src/main/java/io/github/dsheirer/source/tuner/sdrplay/api/SDRplay.java
index 50c6eb6b..d85d37ae 100644
--- a/src/main/java/io/github/dsheirer/source/tuner/sdrplay/api/SDRplay.java
+++ b/src/main/java/io/github/dsheirer/source/tuner/sdrplay/api/SDRplay.java
@@ -561,21 +561,28 @@ public class SDRplay
      */
     public Status close()
     {
-        Status closeStatus;
-
-        try
+        if(mSdrplayLibraryLoaded)
         {
-            closeStatus = Status.fromValue(sdrplay_api_h.sdrplay_api_Close());
-        }
-        catch(Exception e)
-        {
-            closeStatus = Status.FAIL;
-            mLog.error("Error closing SDRPlay API", e);
-        }
+            Status closeStatus;
 
-        mSdrplayLibraryLoaded = false;
-        mAvailable = false;
-        return closeStatus;
+            try
+            {
+                closeStatus = Status.fromValue(sdrplay_api_h.sdrplay_api_Close());
+            }
+            catch(Exception e)
+            {
+                closeStatus = Status.FAIL;
+                mLog.error("Error closing SDRPlay API", e);
+            }
+
+            mSdrplayLibraryLoaded = false;
+            mAvailable = false;
+            return closeStatus;
+        }
+        else
+        {
+            return Status.API_UNAVAILABLE;
+        }
     }
 
     /**