diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-26 02:22:40 -0300 | 
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-01-26 02:27:14 -0300 | 
| commit | fc6d46c374b60e48b8bac8cbcefb587432ae0efd (patch) | |
| tree | 8731c6ad0c0ade3e194026296b9e768f134e9594 | |
| parent | 1f4ca1e841cd0b0427218d787efe10a3fa62df33 (diff) | |
video_core: Silent implicit conversion warning
| -rw-r--r-- | src/video_core/video_core.cpp | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index f7de3471b..0b8ccdd44 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -16,9 +16,10 @@ std::unique_ptr<RendererBase> 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<u16>( +        Settings::values.resolution_factor +            ? Settings::values.resolution_factor +            : renderer.GetRenderWindow().GetFramebufferLayout().GetScalingRatio());  }  } // namespace VideoCore  | 
