Merge pull request #1 from foxtacles/perfect-setdevicename

lego1: perfect SetDeviceName
This commit is contained in:
Thomas May 2023-06-15 16:16:21 +01:00 committed by GitHub
commit 753ed04611
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -30,22 +30,23 @@ 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);
if (this->m_deviceId != 0) {
strcpy(this->m_deviceId, id); strcpy(this->m_deviceId, id);
} }
} }
else {
this->m_deviceId = 0;
}
}
MxVideoParam::~MxVideoParam() MxVideoParam::~MxVideoParam()
{ {