fixed, compiler error: operands to ?: have different types

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30515 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 8 insertions, 2 deletions

diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index f006f21306..0f56a85128 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -96,7 +96,10 @@ const CStdString TranslateContent(const CONTENT_TYPE &type, bool pretty/*=false*
   {
     const ContentMapping &map = content[index];
     if (type == map.type)
-      return (pretty && map.pretty) ? g_localizeStrings.Get(map.pretty) : map.name;
+      if (pretty && map.pretty)
+        return g_localizeStrings.Get(map.pretty);
+      else
+        return map.name;
   }
   return "";
 }
@@ -118,7 +121,10 @@ const CStdString TranslateType(const ADDON::TYPE &type, bool pretty/*=false*/)
   {
     const TypeMapping &map = types[index];
     if (type == map.type)
-      return (pretty && map.pretty) ? g_localizeStrings.Get(map.pretty) : map.name;
+      if (pretty && map.pretty)
+        return g_localizeStrings.Get(map.pretty);
+      else
+        return map.name;
   }
   return "";
 }