From 187c9d7e33220dd100abf5d5b76f9d9cab7f3084 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 24 Jan 2022 11:48:59 -0500 Subject: input_common/input_mapping: Simplify UUID validity checks Makes the checks a little more intuitive to read and doesn't construct an extra UUID instance --- src/input_common/input_mapping.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input_common/input_mapping.cpp') diff --git a/src/input_common/input_mapping.cpp b/src/input_common/input_mapping.cpp index 02c7ccff7..a7a6ad8c2 100644 --- a/src/input_common/input_mapping.cpp +++ b/src/input_common/input_mapping.cpp @@ -56,7 +56,7 @@ void MappingFactory::StopMapping() { void MappingFactory::RegisterButton(const MappingData& data) { Common::ParamPackage new_input; new_input.Set("engine", data.engine); - if (data.pad.guid != Common::UUID{}) { + if (data.pad.guid.IsValid()) { new_input.Set("guid", data.pad.guid.Format()); } new_input.Set("port", static_cast(data.pad.port)); @@ -92,7 +92,7 @@ void MappingFactory::RegisterButton(const MappingData& data) { void MappingFactory::RegisterStick(const MappingData& data) { Common::ParamPackage new_input; new_input.Set("engine", data.engine); - if (data.pad.guid != Common::UUID{}) { + if (data.pad.guid.IsValid()) { new_input.Set("guid", data.pad.guid.Format()); } new_input.Set("port", static_cast(data.pad.port)); @@ -137,7 +137,7 @@ void MappingFactory::RegisterStick(const MappingData& data) { void MappingFactory::RegisterMotion(const MappingData& data) { Common::ParamPackage new_input; new_input.Set("engine", data.engine); - if (data.pad.guid != Common::UUID{}) { + if (data.pad.guid.IsValid()) { new_input.Set("guid", data.pad.guid.Format()); } new_input.Set("port", static_cast(data.pad.port)); -- cgit v1.2.3