summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2011-03-22 07:27:23 +0000
committerJordan Woyak <jordan.woyak@gmail.com>2011-03-22 07:27:23 +0000
commitf8620fcd0b4dcc6006a6a228cd5cc79cc82a83fc (patch)
tree0bd19b701ebf689d0f07719816d59c6391e7eb29 /Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
parent017735b9ffdc7305f07b461a100f62c1d2fbe9ef (diff)
Fixed some memory leaks. Only one was mine ;P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7392 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
index b738d5aabb..a995ae415a 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.cpp
@@ -447,7 +447,7 @@ ControllerInterface::Device* ControllerInterface::FindDevice(const ControllerInt
ControllerInterface::Device::Control* ControllerInterface::InputReference::Detect(const unsigned int ms, Device* const device)
{
unsigned int time = 0;
- bool* const states = new bool[device->Inputs().size()];
+ std::vector<bool> states(device->Inputs().size());
if (device->Inputs().size() == 0)
return NULL;
@@ -457,14 +457,14 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
std::vector<Device::Input*>::const_iterator
i = device->Inputs().begin(),
e = device->Inputs().end();
- for (bool* state=states; i != e; ++i)
+ for (std::vector<bool>::iterator state = states.begin(); i != e; ++i)
*state++ = ((*i)->GetState() > INPUT_DETECT_THRESHOLD);
while (time < ms)
{
device->UpdateInput();
i = device->Inputs().begin();
- for (bool* state=states; i != e; ++i,++state)
+ for (std::vector<bool>::iterator state = states.begin(); i != e; ++i,++state)
{
// detected an input
if ((*i)->IsDetectable() && (*i)->GetState() > INPUT_DETECT_THRESHOLD)
@@ -480,8 +480,6 @@ ControllerInterface::Device::Control* ControllerInterface::InputReference::Detec
Common::SleepCurrentThread(10); time += 10;
}
- delete[] states;
-
// no input was detected
return NULL;
}