The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into 'master'

Browse Source
This commit is contained in:
Scott Mansell
2015-07-13 12:40:38 +12:00
parent b30ae1b9f8 87e19f1c19
commit dc25277a2f
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
View File

@ -217,6 +217,12 @@ void evdevDevice::ForceFeedback::SetState(ControlState state)
// libevdev doesn't have nice helpers for forcefeedback
// we will use the file descriptors directly.
if (m_id != -1) // delete the previous effect (which also stops it)
{
ioctl(m_fd, EVIOCRMFF, m_id);
m_id = -1;
}
if (state > 0) // Upload and start an effect.
{
ff_effect effect;
@ -261,9 +267,14 @@ void evdevDevice::ForceFeedback::SetState(ControlState state)
write(m_fd, (const void*) &play, sizeof(play));
}
else if (m_id != -1) // delete the effect (which also stops it)
}
evdevDevice::ForceFeedback::~ForceFeedback()
{
// delete the uploaded effect, so we don't leak it.
if (m_id != -1)
{
ioctl(m_id, EVIOCRMFF, m_id);
ioctl(m_fd, EVIOCRMFF, m_id);
}
}