From 0305afbc023af56bc31365befe09e13d5d53cf76 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Tue, 4 Feb 2025 19:56:07 +0200 Subject: [PATCH] catch and log any linkage errors while enumerating hwws --- drongo | 2 +- lark | 2 +- src/main/java/com/sparrowwallet/sparrow/io/Hwi.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drongo b/drongo index 342c85a3..ca758e12 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 342c85a39e45c8e14c4b35f5188ecf93a6c826d6 +Subproject commit ca758e128876470f673b5955d75d5311b47c6938 diff --git a/lark b/lark index b379338c..b80cbbbc 160000 --- a/lark +++ b/lark @@ -1 +1 @@ -Subproject commit b379338cc270d32e4225cb67392fc7c3a7c91b85 +Subproject commit b80cbbbc57939284cf270a7b450a0059d5f0ec15 diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java index 796f27d9..9b590ec7 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/Hwi.java @@ -54,7 +54,7 @@ public class Hwi { Lark lark = getLark(passphrase); isPromptActive = true; return lark.enumerate().stream().map(Device::fromHardwareClient).toList(); - } catch(Exception e) { + } catch(Throwable e) { log.error("Error enumerating USB devices", e); throw new ImportException("Error scanning" + (e.getMessage() == null || e.getMessage().isEmpty() ? ", check devices are ready" : ": " + e.getMessage()), e); } finally {