Prevent crash

3 years ago · 03b1c9edf5
parent 3664d9b656
commit 03b1c9edf5
1 changed files with 4 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@ -625,8 +625,10 @@ public class ViewModelMessages extends ViewModel {
                owner.getLifecycle().addObserver(new LifecycleObserver() {
                    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
                    public void onDestroyed() {
-                        boundary.destroy(state);
-                        boundary = null;
+                        if (boundary != null) {
+                            boundary.destroy(state);
+                            boundary = null;
+                        }
                        owner.getLifecycle().removeObserver(this);
                    }
                });