From 7ce1deb51439475bbb4187854acd404573dd34f6 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 6 Apr 2021 12:55:51 +0100 Subject: [PATCH] Migrate game_controller.cpp to SDLUniquePtr --- SourceX/controls/devices/game_controller.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SourceX/controls/devices/game_controller.cpp b/SourceX/controls/devices/game_controller.cpp index 805d31852..a122f4f79 100644 --- a/SourceX/controls/devices/game_controller.cpp +++ b/SourceX/controls/devices/game_controller.cpp @@ -7,6 +7,7 @@ #include "controls/controller_motion.h" #include "controls/devices/joystick.h" #include "stubs.h" +#include "sdl_ptrs.h" // Defined in SourceX/controls/plctrls.cpp extern "C" bool sgbControllerActive; @@ -166,9 +167,8 @@ void GameController::Add(int joystick_index) controllers_->push_back(result); const SDL_JoystickGUID guid = SDL_JoystickGetGUID(sdl_joystick); - char *mapping = SDL_GameControllerMappingForGUID(guid); - SDL_Log("Opened game controller with mapping:\n%s", mapping); - SDL_free(mapping); + SDLUniquePtr mapping{SDL_GameControllerMappingForGUID(guid)}; + SDL_Log("Opened game controller with mapping:\n%s", mapping.get()); } void GameController::Remove(SDL_JoystickID instance_id)