From fc6d46c374b60e48b8bac8cbcefb587432ae0efd Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sat, 26 Jan 2019 02:22:40 -0300 Subject: [PATCH] video_core: Silent implicit conversion warning --- src/video_core/video_core.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index f7de3471bd..0b8ccdd449 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -16,9 +16,10 @@ std::unique_ptr CreateRenderer(Core::Frontend::EmuWindow& emu_wind } u16 GetResolutionScaleFactor(const RendererBase& renderer) { - return !Settings::values.resolution_factor - ? renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio() - : Settings::values.resolution_factor; + return static_cast( + Settings::values.resolution_factor + ? Settings::values.resolution_factor + : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio()); } } // namespace VideoCore