Merge pull request #4382 from jmarshallnz/fix_non_addon_scripts

[python] fix scripts run directly that aren't an add-on. fixes #14265

1 files changed, 6 insertions, 5 deletions

diff --git a/xbmc/interfaces/python/LanguageHook.cpp b/xbmc/interfaces/python/LanguageHook.cpp
index 832611cc1b..12bb50c74d 100644
--- a/xbmc/interfaces/python/LanguageHook.cpp
+++ b/xbmc/interfaces/python/LanguageHook.cpp
@@ -129,7 +129,6 @@ namespace XBMCAddon
     String PythonLanguageHook::GetAddonId()
     {
       XBMC_TRACE;
-      const char* id = NULL;
 
       // Get a reference to the main module
       // and global dictionary
@@ -138,8 +137,9 @@ namespace XBMCAddon
       // Extract a reference to the function "func_name"
       // from the global dictionary
       PyObject* pyid = PyDict_GetItemString(global_dict, "__xbmcaddonid__");
-      id = PyString_AsString(pyid);
-      return id;
+      if (pyid)
+        return PyString_AsString(pyid);
+      return "";
     }
 
     String PythonLanguageHook::GetAddonVersion()
@@ -152,8 +152,9 @@ namespace XBMCAddon
       // Extract a reference to the function "func_name"
       // from the global dictionary
       PyObject* pyversion = PyDict_GetItemString(global_dict, "__xbmcapiversion__");
-      String version(PyString_AsString(pyversion));
-      return version;
+      if (pyversion)
+        return PyString_AsString(pyversion);
+      return "";
     }
 
     void PythonLanguageHook::RegisterPlayerCallback(IPlayerCallback* player) { XBMC_TRACE; g_pythonParser.RegisterPythonPlayerCallBack(player); }