From 992468d6c172231847b9a28379181601b0e4f5e4 Mon Sep 17 00:00:00 2001
From: Integral <integral@member.fsf.org>
Date: Mon, 17 Jun 2024 11:00:45 +0800
Subject: [PATCH] Place repeatedPassword after first check & remove unnecessary
 empty check

---
 src/UserSettingsPage.cpp | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 4dfdc96a..f50bc3c0 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -2127,6 +2127,11 @@ UserSettingsModel::exportSessionKeys()
     if (!ok)
         return;
 
+    if (password.isEmpty()) {
+        QMessageBox::warning(nullptr, tr("Error"), tr("The password cannot be empty"));
+        return;
+    }
+
     auto repeatedPassword = QInputDialog::getText(nullptr,
                                                   tr("Repeat File Password"),
                                                   tr("Repeat the passphrase:"),
@@ -2136,16 +2141,6 @@ UserSettingsModel::exportSessionKeys()
     if (!ok)
         return;
 
-    if (password.isEmpty()) {
-        QMessageBox::warning(nullptr, tr("Error"), tr("The password cannot be empty"));
-        return;
-    }
-
-    if (repeatedPassword.isEmpty()) {
-        QMessageBox::warning(nullptr, tr("Error"), tr("Please repeat the password"));
-        return;
-    }
-
     if (password != repeatedPassword) {
         QMessageBox::warning(nullptr, tr("Error"), tr("Passwords don't match"));
         return;