From cdf205e705baa49459db9b6c4208fa4c35ccd247 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 11 Aug 2023 06:48:54 +0000
Subject: [PATCH] Small fixes

---
 app/src/main/java/io/xpipe/app/issue/UserReportComp.java | 8 ++++++++
 app/src/main/java/io/xpipe/app/storage/DataStorage.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java
index 16914a1a6..fe69980e1 100644
--- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java
+++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java
@@ -34,10 +34,17 @@ public class UserReportComp extends SimpleComp {
     private final ErrorEvent event;
     private final Stage stage;
 
+    private boolean sent;
+
     public UserReportComp(ErrorEvent event, Stage stage) {
         this.event = event;
         this.includedDiagnostics = new SimpleListProperty<>(FXCollections.observableArrayList());
         this.stage = stage;
+        stage.setOnHidden(event1 -> {
+            if (!sent) {
+                ErrorAction.ignore().handle(event);
+            }
+        });
     }
 
     public static void show(ErrorEvent event) {
@@ -115,6 +122,7 @@ public class UserReportComp extends SimpleComp {
         includedDiagnostics.forEach(event::addAttachment);
         event.attachUserReport(text.get());
         SentryErrorHandler.getInstance().handle(event);
+        sent = true;
         stage.close();
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
index 296af01f6..183cdd63c 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java
@@ -226,7 +226,7 @@ public abstract class DataStorage {
 
     public synchronized List<DataStore> getUsableStores() {
         return new ArrayList<>(getStoreEntries().stream()
-                .filter(entry -> !entry.isDisabled())
+                .filter(entry -> entry.getState().isUsable())
                 .map(DataStoreEntry::getStore)
                 .toList());
     }