From 9177bc2b9b7799be1e296d560851db47bcf84396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 11 Aug 2023 10:58:54 +0800 Subject: [PATCH] Display (Linux): don't use `unknown` as the display name --- src/detection/displayserver/linux/wayland.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/detection/displayserver/linux/wayland.c b/src/detection/displayserver/linux/wayland.c index 14292b641..06d7c7f75 100644 --- a/src/detection/displayserver/linux/wayland.c +++ b/src/detection/displayserver/linux/wayland.c @@ -95,8 +95,11 @@ static void waylandOutputGeometryListener(void *data, { WaylandDisplay* display = data; display->transform = (enum wl_output_transform) transform; - ffStrbufAppendS(&display->vendorAndModelId, make); - ffStrbufAppendS(&display->vendorAndModelId, model); + if (make && !ffStrEqualsIgnCase(make, "unknown") && model && !ffStrEqualsIgnCase(model, "unknown")) + { + ffStrbufAppendS(&display->vendorAndModelId, make); + ffStrbufAppendS(&display->vendorAndModelId, model); + } } static bool matchDrmConnector(const char* wlName, FFstrbuf* edidName) @@ -154,7 +157,8 @@ static void waylandOutputDescriptionListener(void* data, FF_MAYBE_UNUSED struct { WaylandDisplay* display = data; while (*description == ' ') ++description; - ffStrbufAppendS(&display->description, description); + if (!ffStrEquals(description, "Unknown Display")) + ffStrbufAppendS(&display->description, description); } static void waylandOutputHandler(WaylandData* wldata, struct wl_registry* registry, uint32_t name, uint32_t version)