1 files changed, 14 insertions, 7 deletions
diff --git a/xbmc/interfaces/python/XBPyThread.cpp b/xbmc/interfaces/python/XBPyThread.cpp
index e081f939d5..238fb9d37b 100644
--- a/xbmc/interfaces/python/XBPyThread.cpp
+++ b/xbmc/interfaces/python/XBPyThread.cpp
@@ -159,7 +159,7 @@ static const CStdString getListOfAddonClassesAsString(XBMCAddon::AddonClass::Ref
   std::set<XBMCAddon::AddonClass*>& acs = languageHook->GetRegisteredAddonClasses();
   bool firstTime = true;
   for (std::set<XBMCAddon::AddonClass*>::iterator iter = acs.begin();
-       iter != acs.end(); iter++)
+       iter != acs.end(); ++iter)
   {
     if (!firstTime) message += ",";
     else firstTime = false;
@@ -341,14 +341,21 @@ void XBPyThread::Process()
       if (pDlgToast)
       {
         CStdString desc;
-        CStdString path;
         CStdString script;
-        URIUtils::Split(m_source, path, script);
-        if (script.Equals("default.py"))
+        if (addon.get() != NULL)
+        {
+          script = addon->Name();
+        }
+        else
         {
-          CStdString path2;
-          URIUtils::RemoveSlashAtEnd(path);
-          URIUtils::Split(path, path2, script);
+          CStdString path;
+          URIUtils::Split(m_source, path, script);
+          if (script.Equals("default.py"))
+          {
+            CStdString path2;
+            URIUtils::RemoveSlashAtEnd(path);
+            URIUtils::Split(path, path2, script);
+          }
         }
 
         desc.Format(g_localizeStrings.Get(2100), script);