diff options
author | Kai Sommerfeld <kai.sommerfeld@gmx.com> | 2022-07-04 21:57:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-04 21:57:17 +0200 |
commit | a66ab3a49dc61422c2709eee6a2bdc03af2110b4 (patch) | |
tree | 12da332a89640af5f91843d21320c52b0fc2ef0b | |
parent | b3f37f159243d9c857ba1a72f46d67a8d46df901 (diff) | |
parent | e1cb54b9913fd1ce104f80937a622039436be0ba (diff) | |
download | xbmc-a66ab3a49dc61422c2709eee6a2bdc03af2110b4.tar.xz |
Merge pull request #21637 from repojohnray/cstructhdl_matrix
[addons] add CStructHdl operator= support for 'A = A'
-rw-r--r-- | xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h index 06b22d5193..3777f82d39 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/AddonBase.h @@ -263,6 +263,10 @@ public: const CStructHdl& operator=(const CStructHdl& right) { assert(&right.m_cStructure); + + if (this == &right) + return *this; + if (m_cStructure && !m_owner) { memcpy(m_cStructure, right.m_cStructure, sizeof(C_STRUCT)); @@ -280,6 +284,10 @@ public: const CStructHdl& operator=(const C_STRUCT& right) { assert(&right); + + if (m_cStructure == &right) + return *this; + if (m_cStructure && !m_owner) { memcpy(m_cStructure, &right, sizeof(C_STRUCT)); |