diff options
| author | Saturn&Eric <[email protected]> | 2022-07-23 14:54:51 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-07-23 14:54:51 +0000 |
| commit | b244320b2d228189767aa6d59febceb6b64527fb (patch) | |
| tree | 179d34e2a3e84231fad72c4bbe9f74673d0b74d0 /src/ui/main_window/MainWindowSlotFunction.cpp | |
| parent | Merge pull request #68 from saturneric/develop-2.0.8 (diff) | |
| parent | feat(project): add rpm package support (diff) | |
| download | GpgFrontend-2.0.9.tar.gz GpgFrontend-2.0.9.zip | |
Merge pull request #70 from saturneric/dev/2.0.8/saturnericv2.0.9
Develop 2.0.9.1
Diffstat (limited to '')
| -rw-r--r-- | src/ui/main_window/MainWindowSlotFunction.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index 0ad52248..f715046c 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -26,7 +26,6 @@ * */ -#include <cstddef> #include <memory> #include <string> #include <utility> @@ -34,15 +33,12 @@ #include "MainWindow.h" #include "core/GpgConstants.h" #include "core/GpgModel.h" -#include "core/function/GlobalSettingStation.h" #include "core/function/gpg/GpgBasicOperator.h" #include "core/function/gpg/GpgKeyGetter.h" #include "core/function/gpg/GpgKeyImportExporter.h" -#include "core/model/GpgKey.h" -#include "core/thread/TaskRunner.h" #include "ui/UserInterfaceUtils.h" -#include "ui/help/AboutDialog.h" -#include "ui/widgets/SignersPicker.h" +#include "ui/dialog/help/AboutDialog.h" +#include "dialog/SignersPicker.h" namespace GpgFrontend::UI { /** @@ -427,6 +423,9 @@ void MainWindow::slot_encrypt_sign() { connect(signersPicker, &SignersPicker::finished, &loop, &QEventLoop::quit); loop.exec(); + // return when canceled + if (!signersPicker->GetStatus()) return; + auto signer_key_ids = signersPicker->GetCheckedSigners(); auto signer_keys = GpgKeyGetter::GetInstance().GetKeys(signer_key_ids); |