summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-06-26 04:03:33 +0200
committerGitHub <noreply@github.com>2016-06-26 04:03:33 +0200
commitc1fa1e67497ed38623f63d1457e1992e56287833 (patch)
treeab08f49876092b20db0d05faabfa769c76fb2abc /Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
parente31a4d1f0731603d0396e592e23cf7acd0457397 (diff)
parent8678133e8746fdc20f7d012005ebf2db370ddccc (diff)
Merge pull request #3923 from leoetlino/ciface-small-cleanup
ControllerInterface: Small cleanup
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
index ea059fde73..ecd1bf1d40 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
@@ -58,12 +58,10 @@ void InitJoystick(IDirectInput8* const idi8, HWND hwnd)
}
}
- Joystick* js = new Joystick(/*&*i, */ js_device, name_counts[joystick.tszInstanceName]++);
+ auto js = std::make_shared<Joystick>(js_device, name_counts[joystick.tszInstanceName]++);
// only add if it has some inputs/outputs
if (js->Inputs().size() || js->Outputs().size())
- g_controller_interface.AddDevice(js);
- else
- delete js;
+ g_controller_interface.AddDevice(std::move(js));
}
else
{