diff options
| author | saturneric <[email protected]> | 2025-02-04 15:17:16 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-02-04 15:17:16 +0000 |
| commit | 4050dd0db4ff31c3de1a966ceade1c20540c63b5 (patch) | |
| tree | ff948010519560a382545768cbb8b7b4ec9a580e /src/core | |
| parent | Merge branch 'develop' (diff) | |
| download | GpgFrontend-4050dd0db4ff31c3de1a966ceade1c20540c63b5.tar.gz GpgFrontend-4050dd0db4ff31c3de1a966ceade1c20540c63b5.zip | |
fix: solve discovered issues before release v2.1.7
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/GpgCoreInit.cpp | 4 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgCommandExecutor.cpp | 2 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgContext.cpp | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index 5018b8e4..e12c71f1 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -81,7 +81,7 @@ auto GetDefaultKeyDatabasePath(const QString& gpgconf_path) -> QString { QFileInfo info(gpgconf_path); if (!info.exists() || !info.isFile()) return {}; - auto* p = new QProcess(QCoreApplication::instance()); + auto* p = new QProcess(); p->setProgram(info.absoluteFilePath()); p->setArguments({"--list-dirs", "homedir"}); p->start(); @@ -275,7 +275,7 @@ auto RefreshGpgMEBackendEngine(const QString& gpgconf_path, auto GetComponentPathsByGpgConf(const QString& gpgconf_install_fs_path) -> bool { - auto* process = new QProcess(QCoreApplication::instance()); + auto* process = new QProcess(); process->setProgram(gpgconf_install_fs_path); process->setArguments({"--check-programs"}); process->start(); diff --git a/src/core/function/gpg/GpgCommandExecutor.cpp b/src/core/function/gpg/GpgCommandExecutor.cpp index b244dfa4..a4ab8990 100644 --- a/src/core/function/gpg/GpgCommandExecutor.cpp +++ b/src/core/function/gpg/GpgCommandExecutor.cpp @@ -149,7 +149,7 @@ void GpgCommandExecutor::ExecuteSync(ExecuteContext context) { Thread::Task *task = BuildTaskFromExecCtx(context); QPointer<Thread::Task> p_t = task; - auto *looper = new QEventLoop(QCoreApplication::instance()); + auto *looper = new QEventLoop(); QObject::connect(task, &Thread::Task::SignalTaskEnd, looper, &QEventLoop::quit); diff --git a/src/core/function/gpg/GpgContext.cpp b/src/core/function/gpg/GpgContext.cpp index 002c0488..e93544ba 100644 --- a/src/core/function/gpg/GpgContext.cpp +++ b/src/core/function/gpg/GpgContext.cpp @@ -211,8 +211,7 @@ class GpgContext::Impl { auto set_ctx_openpgp_engine_info(gpgme_ctx_t ctx) -> bool { const auto app_path = Module::RetrieveRTValueTypedOrDefault<>( - "core", QString("gpgme.ctx.app_path").arg(parent_->GetChannel()), - QString{}); + "core", QString("gpgme.ctx.app_path"), QString{}); QString database_path; // set custom gpg key db path |