diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 26ed2304db..5bbd467eb6 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -420,10 +420,17 @@ bool IsSNIAvailable() { if (reply.isValid()) { return reply.value().toBool(); - } else if (reply.error().type() != QDBusError::ServiceUnknown) { - LOG(("SNI Error: %1").arg(reply.error().message())); } + switch (reply.error().type()) { + case QDBusError::Disconnected: + case QDBusError::ServiceUnknown: + return false; + default: + break; + } + + LOG(("SNI Error: %1").arg(reply.error().message())); return false; } diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index c4c68a724c..83c8cd84f4 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -103,7 +103,7 @@ QStringList ListDBusActivatableNames() { if (reply.isValid()) { return reply.value(); - } else { + } else if (reply.error().type() != QDBusError::Disconnected) { LOG(("App Error: %1: %2") .arg(reply.error().name()) .arg(reply.error().message())); @@ -155,13 +155,12 @@ void PortalAutostart(bool autostart, bool silent = false) { if (silent) { QDBusConnection::sessionBus().send(message); - } else { - const QDBusReply reply = QDBusConnection::sessionBus().call( - message); + return; + } - if (!reply.isValid()) { - LOG(("Flatpak autostart error: %1").arg(reply.error().message())); - } + const QDBusError error = QDBusConnection::sessionBus().call(message); + if (error.isValid()) { + LOG(("Flatpak autostart error: %1").arg(error.message())); } } @@ -217,11 +216,11 @@ uint FileChooserPortalVersion() { if (reply.isValid()) { return reply.value().toUInt(); - } else { - LOG(("Error getting FileChooser portal version: %1") - .arg(reply.error().message())); } + LOG(("Error getting FileChooser portal version: %1") + .arg(reply.error().message())); + return 0; }();