Fix check for disconnected error

desktop-app · Apr 30, 2021 · d018714 · d018714
1 parent 0baa954
commit d018714
Showing 1 changed file with 26 additions and 6 deletions.
diff --git a/base/platform/linux/base_last_input_linux.cpp b/base/platform/linux/base_last_input_linux.cpp
@@ -72,8 +72,19 @@ std::optional<crl::time> FreedesktopDBusLastUserInputTime() {
 	}
 
 	try {
-		const auto connection = Gio::DBus::Connection::get_sync(
-			Gio::DBus::BusType::BUS_TYPE_SESSION);
+		const auto connection = [] {
+			try {
+				return Gio::DBus::Connection::get_sync(
+					Gio::DBus::BusType::BUS_TYPE_SESSION);
+			} catch (...) {
+				return Glib::RefPtr<Gio::DBus::Connection>();
+			}
+		}();
+
+		if (!connection) {
+			NotSupported = true;
+			return std::nullopt;
+		}
 
 		auto reply = connection->call_sync(
 			"/org/freedesktop/ScreenSaver",
@@ -86,7 +97,6 @@ std::optional<crl::time> FreedesktopDBusLastUserInputTime() {
 		return (crl::now() - static_cast<crl::time>(value));
 	} catch (const Glib::Error &e) {
 		static const auto NotSupportedErrors = {
-			"org.freedesktop.DBus.Error.Disconnected",
 			"org.freedesktop.DBus.Error.ServiceUnknown",
 			"org.freedesktop.DBus.Error.NotSupported",
 		};
@@ -123,8 +133,19 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
 	}
 
 	try {
-		const auto connection = Gio::DBus::Connection::get_sync(
-			Gio::DBus::BusType::BUS_TYPE_SESSION);
+		const auto connection = [] {
+			try {
+				return Gio::DBus::Connection::get_sync(
+					Gio::DBus::BusType::BUS_TYPE_SESSION);
+			} catch (...) {
+				return Glib::RefPtr<Gio::DBus::Connection>();
+			}
+		}();
+
+		if (!connection) {
+			NotSupported = true;
+			return std::nullopt;
+		}
 
 		auto reply = connection->call_sync(
 			"/org/gnome/Mutter/IdleMonitor/Core",
@@ -137,7 +158,6 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
 		return (crl::now() - static_cast<crl::time>(value));
 	} catch (const Glib::Error &e) {
 		static const auto NotSupportedErrors = {
-			"org.freedesktop.DBus.Error.Disconnected",
 			"org.freedesktop.DBus.Error.ServiceUnknown",
 		};