avoid possible NPE (#471)

6 years ago · 38a825d580
parent be04185481
commit 38a825d580
1 changed files with 4 additions and 3 deletions
--- a/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/util/Helper.java
@ -438,8 +438,10 @@ public class Helper {
                if (result) {
                    Helper.hideKeyboardAlways((Activity) context);
                    cancelSignal.cancel();
-                    openDialog.dismiss();
-                    openDialog = null;
+                    if (openDialog != null) { // maybe it was cancelled in the meantime
+                        openDialog.dismiss();
+                        openDialog = null;
+                    }
                } else {
                    if (fingerprintUsed) {
                        incorrectSavedPass.set(true);
@ -458,7 +460,6 @@ public class Helper {
                        etPassword.setError(context.getString(R.string.bad_password));
                    }
                }
-
                loginTask = null;
            }
        }