mirror of
https://github.com/isledecomp/isle.git
synced 2024-11-22 23:57:54 -05:00
Merge pull request #1 from foxtacles/perfect-setdevicename
lego1: perfect SetDeviceName
This commit is contained in:
commit
753ed04611
1 changed files with 8 additions and 7 deletions
|
@ -30,20 +30,21 @@ MxVideoParam &MxVideoParam::operator=(const MxVideoParam &other)
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: this doesn't match exactly, something weird with the conditional on id
|
|
||||||
void MxVideoParam::SetDeviceName(char *id)
|
void MxVideoParam::SetDeviceName(char *id)
|
||||||
{
|
{
|
||||||
if (this->m_deviceId != 0)
|
if (this->m_deviceId != 0)
|
||||||
free(this->m_deviceId);
|
free(this->m_deviceId);
|
||||||
|
|
||||||
if (id == 0)
|
if (id != 0)
|
||||||
{
|
|
||||||
this->m_deviceId = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
this->m_deviceId = (char *)malloc(strlen(id) + 1);
|
this->m_deviceId = (char *)malloc(strlen(id) + 1);
|
||||||
strcpy(this->m_deviceId, id);
|
|
||||||
|
if (this->m_deviceId != 0) {
|
||||||
|
strcpy(this->m_deviceId, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this->m_deviceId = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue