Display (Linux): fix preferred resolution detection for wayland

CarterLi · CarterLi · commit a567268ca10f · 2024-11-20T21:38:18.000+08:00
diff --git a/src/detection/displayserver/linux/wayland/kde-output.c b/src/detection/displayserver/linux/wayland/kde-output.c
@@ -69,7 +69,7 @@ static void waylandKdeCurrentModeListener(void* data, FF_MAYBE_UNUSED struct kde
             wldata->refreshRate = m->refreshRate;
             if (++set == 2) break;
         }
-        else if (m->preferred)
+        if (m->preferred)
         {
             wldata->preferredWidth = m->width;
             wldata->preferredHeight = m->height;
diff --git a/src/detection/displayserver/linux/wayland/zwlr-output.c b/src/detection/displayserver/linux/wayland/zwlr-output.c
@@ -78,7 +78,7 @@ static void waylandZwlrCurrentModeListener(void* data, FF_MAYBE_UNUSED struct zw
             wldata->refreshRate = m->refreshRate;
             if (++set == 2) break;
         }
-        else if (m->preferred)
+        if (m->preferred)
         {
             wldata->preferredWidth = m->width;
             wldata->preferredHeight = m->height;

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ static void waylandKdeCurrentModeListener(void* data, FF_MAYBE_UNUSED struct kde`
`69`	`69`	`wldata->refreshRate = m->refreshRate;`
`70`	`70`	`if (++set == 2) break;`
`71`	`71`	`}`
`72`		`- else if (m->preferred)`
	`72`	`+ if (m->preferred)`
`73`	`73`	`{`
`74`	`74`	`wldata->preferredWidth = m->width;`
`75`	`75`	`wldata->preferredHeight = m->height;`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ static void waylandZwlrCurrentModeListener(void* data, FF_MAYBE_UNUSED struct zw`
`78`	`78`	`wldata->refreshRate = m->refreshRate;`
`79`	`79`	`if (++set == 2) break;`
`80`	`80`	`}`
`81`		`- else if (m->preferred)`
	`81`	`+ if (m->preferred)`
`82`	`82`	`{`
`83`	`83`	`wldata->preferredWidth = m->width;`
`84`	`84`	`wldata->preferredHeight = m->height;`