Merge pull request #40 from GoXLR-on-Linux/dev-0.7.1

FrostyCoolSlug · web-flow · commit 4c8d38aea231 · 2022-11-16T14:15:59.000Z
Dev 0.7.1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/audio/Cargo.toml b/audio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-audio"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-client"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 build = "build.rs"
 authors = ["Nathan Adams <dinnerbone@dinnerbone.com>", "Craig McLure <craig@mclure.net>", "Lars Mühlbauer <lm41@dismail.de>"]
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-daemon"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 authors = ["Nathan Adams <dinnerbone@dinnerbone.com>", "Craig McLure <craig@mclure.net>", "Lars Mühlbauer <lm41@dismail.de>"]
 description = "Allows control of a TC-Helicon GoXLR or GoXLR Mini, by maintaining an interaction with it over USB in the background."
diff --git a/initialiser/Cargo.toml b/initialiser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-initialiser"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 authors = ["Nathan Adams <dinnerbone@dinnerbone.com>", "Craig McLure <craig@mclure.net>", "Lars Mühlbauer <lm41@dismail.de>"]
 description = "Finds, checks and initialises any unconfigured GoXLR devices"
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-ipc"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 authors = ["Nathan Adams <dinnerbone@dinnerbone.com>", "Craig McLure <craig@mclure.net>", "Lars Mühlbauer <lm41@dismail.de>"]
 description = "An indirect interface to the TC-Helicon GoXLR & GoXLR Mini via IPC and a daemon."
diff --git a/profile/Cargo.toml b/profile/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-profile-loader"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/scribbles/Cargo.toml b/scribbles/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-scribbles"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-types"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 authors = ["Nathan Adams <dinnerbone@dinnerbone.com>", "Craig McLure <craig@mclure.net>", "Lars Mühlbauer <lm41@dismail.de>"]
 description = "A helper crate for all types used in the GoXLR IPC"
diff --git a/usb/Cargo.toml b/usb/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "goxlr-usb"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 authors = ["Nathan Adams <dinnerbone@dinnerbone.com>", "Craig McLure <craig@mclure.net>", "Lars Mühlbauer <lm41@dismail.de>"]
 description = "A direct interface to the TC-Helicon GoXLR & GoXLR Mini via usb."
diff --git a/usb/src/device/usb.rs b/usb/src/device/usb.rs
@@ -29,6 +29,7 @@ pub struct GoXLRUSB {
     identifier: Option<String>,
 
     stopping: Arc<AtomicBool>,
+    disconnecting: bool,
 
     language: Language,
     command_count: u16,
@@ -52,7 +53,18 @@ impl GoXLRUSB {
     }
 
     fn trigger_disconnect(&mut self) -> Result<()> {
+        // If this function has already been called further up the stack, don't run it.
+        if self.disconnecting {
+            return Ok(());
+        }
+
+        // Flag this device as possibly disconnecting..
+        self.disconnecting = true;
+
+        // Perform a connection Check, and reset if needed..
         if self.is_connected() {
+            // We're still connected, reset the disconnecting flag
+            self.disconnecting = false;
             return Ok(());
         }
 
@@ -160,6 +172,7 @@ impl AttachGoXLR for GoXLRUSB {
             identifier: None,
             command_count: 0,
             stopping: Arc::new(AtomicBool::new(false)),
+            disconnecting: false,
             timeout,
         };
 
@@ -296,7 +309,6 @@ impl ExecutableGoXLR for GoXLRUSB {
                 } else {
                     // We can't read from this GoXLR, flag as disconnected.
                     self.trigger_disconnect()?;
-
                     debug!("Failed to receive response (Attempt 20 of 20), possible Dead GoXLR?");
                     return Err(Error::from(response_value.err().unwrap()));
                 }
