From ef440a015d0a03d2739a92e6fac31c4a2890a599 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Thu, 18 Apr 2024 15:18:37 +0800 Subject: [PATCH] Display (Linux): don't display `(null)` --- src/detection/displayserver/linux/wlroots.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/detection/displayserver/linux/wlroots.c b/src/detection/displayserver/linux/wlroots.c index 19fc21374..dadb9c4c3 100644 --- a/src/detection/displayserver/linux/wlroots.c +++ b/src/detection/displayserver/linux/wlroots.c @@ -66,7 +66,13 @@ const char* ffdsConnectWlroots(FFDisplayServerResult* result) FF_STRBUF_AUTO_DESTROY displayName = ffStrbufCreate(); if (!ffdsMatchDrmConnector(connName, &displayName)) - ffStrbufSetS(&displayName, yyjson_get_str(yyjson_obj_get(device, "description"))); + { + const char* desc = yyjson_get_str(yyjson_obj_get(device, "description")); + if (ffStrContains(desc, "(null)")) + ffStrbufSetS(&displayName, connName); + else + ffStrbufSetS(&displayName, desc); + } uint32_t rotation = 0; const char* transform = yyjson_get_str(yyjson_obj_get(device, "transform")); if (!ffStrEquals(transform, "normal"))