From 304ea080c9dd468d4e8df3b7350213d0b05d5924 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 24 Jul 2023 19:38:18 -0500
Subject: [PATCH] Fix race crash

---
 .../java/eu/siacs/conversations/ui/EditAccountActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index cfd40f9c7abed9cf34cacaed1f06e55f61100964..9454ed2029e441bf7daf459b464580768ec8fabc 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -1039,7 +1039,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         final ColorPickerView picker = new ColorPickerView(this);
 
-        picker.setColor(mAccount.getColor(isDarkTheme()));
+        if (mAccount != null) picker.setColor(mAccount.getColor(isDarkTheme()));
         picker.showAlpha(true);
         picker.showHex(true);
         picker.showPreview(true);