ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2854 from Tilka/valgrind 

Fix some small stuff found with Valgrind

Conflicts:
	Source/Core/Core/PowerPC/CachedInterpreter.cpp
This commit is contained in:
Markus Wick 2015-08-15 20:52:12 +02:00 committed by Jules Blok
parent da832d9671
commit 7950c77332
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/AudioCommon/PulseAudioStream.cpp
View File

@ -163,7 +163,8 @@ void PulseAudio::StateCallback(pa_context* c)
void PulseAudio::UnderflowCallback(pa_stream* s)
{
m_pa_ba.tlength += BUFFER_SAMPLES * m_channels * m_bytespersample;
pa_stream_set_buffer_attr(s, &m_pa_ba, nullptr, nullptr);
pa_operation* op = pa_stream_set_buffer_attr(s, &m_pa_ba, nullptr, nullptr);
pa_operation_unref(op);
WARN_LOG(AUDIO, "pulseaudio underflow, new latency: %d bytes", m_pa_ba.tlength);
}

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

@ -41,7 +41,7 @@ void Init(std::vector<Core::Device*> &controllerDevices)
const char* devnode = udev_device_get_devnode(dev);
// We only care about devices which we have read/write access to.
if (access(devnode, W_OK) == 0)
if (devnode && access(devnode, W_OK) == 0)
{
// 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.