From 7da45d6c2c152d146977170647183ab64fd29c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 24 Nov 2022 21:21:52 +0800 Subject: [PATCH] DE: fix detection for Windows Server --- .../displayserver/displayserver_windows.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/detection/displayserver/displayserver_windows.c b/src/detection/displayserver/displayserver_windows.c index 354961094..f39955b8b 100644 --- a/src/detection/displayserver/displayserver_windows.c +++ b/src/detection/displayserver/displayserver_windows.c @@ -39,10 +39,19 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* ins //https://github.com/hykilpikonna/hyfetch/blob/master/neofetch#L2067 const FFOSResult* os = ffDetectOS(instance); - if(ffStrbufCompS(&os->version, "11") == 0 || ffStrbufCompS(&os->version, "10") == 0) - ffStrbufSetS(&ds->dePrettyName, "Fluent"); - else if(ffStrbufCompS(&os->version, "8") == 0 || ffStrbufStartsWithS(&os->version, "8.")) - ffStrbufSetS(&ds->dePrettyName, "Metro"); + if( + ffStrbufEqualS(&os->version, "11") || + ffStrbufEqualS(&os->version, "10") || + ffStrbufEqualS(&os->version, "2022") || + ffStrbufEqualS(&os->version, "2019") || + ffStrbufEqualS(&os->version, "2016") + ) ffStrbufSetS(&ds->dePrettyName, "Fluent"); + else if( + ffStrbufEqualS(&os->version, "8") || + ffStrbufEqualS(&os->version, "81.") || + ffStrbufEqualS(&os->version, "2012 R2") || + ffStrbufEqualS(&os->version, "2012") + ) ffStrbufSetS(&ds->dePrettyName, "Metro"); else ffStrbufSetS(&ds->dePrettyName, "Aero"); }