diff options
| author | bunnei <bunneidev@gmail.com> | 2019-01-27 12:49:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 12:49:59 -0500 |
| commit | 65f390806425508d25a173cda369a20dddbfd4f8 (patch) | |
| tree | 3316454862cabc09dbfb2a99da5fdafd17dfbf0e /src | |
| parent | 6957bac03cfc6a0ca4ca81c21dff52f2aa98d8ff (diff) | |
| parent | fc6d46c374b60e48b8bac8cbcefb587432ae0efd (diff) | |
Merge pull request #2058 from ReinUsesLisp/trunc-warning
video_core: Silent implicit conversion warning
Diffstat (limited to 'src')
| -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 |