From d1bbb364521710532076cd29f1911f07d89f9f5a Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 4 Dec 2017 15:44:46 +0100 Subject: Avoid crashing if we don't find a key. --- framework/src/domain/composercontroller.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp index d09dcd79..471c30f8 100644 --- a/framework/src/domain/composercontroller.cpp +++ b/framework/src/domain/composercontroller.cpp @@ -229,12 +229,8 @@ void ComposerController::findPersonalKey() [this](const std::vector &keys) { if (keys.empty()) { SinkWarning() << "Failed to find a personal key."; - } - if (keys.size() > 1) { - SinkWarning() << "Found multiple keys, using first one:"; - SinkWarning() << " " << keys.front().primaryFingerprint(); - } else { - SinkLog() << "Found personal key: " << keys.front().primaryFingerprint(); + } else if (keys.size() > 1) { + SinkWarning() << "Found multiple keys, using all of them."; } setPersonalKeys(QVariant::fromValue(keys)); setFoundPersonalKeys(!keys.empty()); -- cgit v1.2.3