summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/evdev
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/evdev
parente31a4d1f0731603d0396e592e23cf7acd0457397 (diff)
parent8678133e8746fdc20f7d012005ebf2db370ddccc (diff)
Merge pull request #3923 from leoetlino/ciface-small-cleanup
ControllerInterface: Small cleanup
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/evdev')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
index 5da77e585a..658a442420 100644
--- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
@@ -68,18 +68,13 @@ void Init()
// Unfortunately udev gives us no way to filter out the non event device interfaces.
// So we open it and see if it works with evdev ioctls or not.
std::string name = GetName(devnode);
- evdevDevice* input = new evdevDevice(devnode, name_counts[name]++);
+ auto input = std::make_shared<evdevDevice>(devnode, name_counts[name]++);
if (input->IsInteresting())
{
- g_controller_interface.AddDevice(input);
+ g_controller_interface.AddDevice(std::move(input));
num_controllers++;
}
- else
- {
- // Either it wasn't a evdev device, or it didn't have at least 8 buttons or two axis.
- delete input;
- }
}
udev_device_unref(dev);
}