From cc92ac7577059b52b817296de499776fc5f224b2 Mon Sep 17 00:00:00 2001 From: zoltanvb <101990835+zoltanvb@users.noreply.github.com> Date: Mon, 24 Jun 2024 23:25:14 +0200 Subject: [PATCH] Fix exclusive fullscreen condition Spotted in Android compilation: warning: bitwise or with non-zero value always evaluates to true [-Wtautological-bitwise-compare] --- gfx/video_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 21638a0783..84db427fc2 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1248,7 +1248,7 @@ void video_switch_refresh_rate_maybe( unsigned video_bfi = settings->uints.video_black_frame_insertion; unsigned shader_subframes = settings->uints.video_shader_subframes; bool vrr_runloop_enable = settings->bools.vrr_runloop_enable; - bool exclusive_fullscreen = (video_st->flags | VIDEO_FLAG_FORCE_FULLSCREEN) || ( + bool exclusive_fullscreen = (video_st->flags & VIDEO_FLAG_FORCE_FULLSCREEN) || ( settings->bools.video_fullscreen && !settings->bools.video_windowed_fullscreen); bool windowed_fullscreen = settings->bools.video_fullscreen && settings->bools.video_windowed_fullscreen; bool all_fullscreen = settings->bools.video_fullscreen || settings->bools.video_windowed_fullscreen;