From 04deb97f94088be7293448115ccc68a13bd9fddd Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Wed, 23 Sep 2020 19:19:29 +1000 Subject: [PATCH] MSVC 16.8 Preview 3.1 compiler fix The latest MSVC 16.8 Preview 3.1 cl.exe no longer likes the implicit conversion from false->std::shared_ptr But it's happy with nullptr Not the ideal solution, but it will kick the can down the road a little. --- rpcs3/Input/mm_joystick_handler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Input/mm_joystick_handler.cpp b/rpcs3/Input/mm_joystick_handler.cpp index d6f22bc26c..8b5d2c949d 100644 --- a/rpcs3/Input/mm_joystick_handler.cpp +++ b/rpcs3/Input/mm_joystick_handler.cpp @@ -474,11 +474,11 @@ bool mm_joystick_handler::GetMMJOYDevice(int index, MMJOYDevice* dev) std::shared_ptr mm_joystick_handler::get_device(const std::string& device) { if (!Init()) - return false; + return nullptr; int id = GetIDByName(device); if (id < 0) - return false; + return nullptr; std::shared_ptr joy_device = std::make_shared(m_devices.at(id)); return joy_device;