From c9a27b830d4a7b1bf1e27eaf0f6f747f80856e43 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 30 Nov 2022 13:11:06 +0100
Subject: [PATCH] Add null check before shutting down executor in
 ScannerActivity

---
 .../java/com/beemdevelopment/aegis/ui/ScannerActivity.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
index 39c268ba..018dbeef 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java
@@ -89,7 +89,9 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis
 
     @Override
     protected void onDestroy() {
-        _executor.shutdownNow();
+        if (_executor != null) {
+            _executor.shutdownNow();
+        }
         super.onDestroy();
     }