diff options
| author | Memphiz <memphis@machzwo.de> | 2014-07-14 15:15:01 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-07-14 15:15:01 +0200 |
| commit | 8f480132e024bdd50decb587399107d3c932ef02 (patch) | |
| tree | f2d7bfe2301d7cf4a4387193a0a82817028c5b4d | |
| parent | f06f0cf0efd6a3fb5cf98f453f0a017d468f1537 (diff) | |
[std:string] - fix implicit std::string c'tor with NULL argument - crashed on addon with empty disclaimer tag in addon.xml
| -rw-r--r-- | xbmc/addons/AddonManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp index 155c40247c..6a46ef7d36 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -634,7 +634,7 @@ std::string CAddonMgr::GetTranslatedString(const cp_cfg_element_t *root, const c eng = &child; } } - return (eng) ? eng->value : ""; + return (eng && eng->value) ? eng->value : ""; } AddonPtr CAddonMgr::AddonFromProps(AddonProps& addonProps) |