From c8b4b10c82e2071639a785f3dfe4f9138df327d5 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Sun, 10 Oct 2010 20:44:52 +0300 Subject: [PATCH 7/7] added: add error handling to another addon installation failure case In case LoadAddonDescription() fails, notify user and remove the addon from the addon directory. --- xbmc/GUIWindowAddonBrowser.cpp | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/xbmc/GUIWindowAddonBrowser.cpp b/xbmc/GUIWindowAddonBrowser.cpp index 0de3f0f..0497bb4 100644 --- a/xbmc/GUIWindowAddonBrowser.cpp +++ b/xbmc/GUIWindowAddonBrowser.cpp @@ -373,6 +373,16 @@ void CGUIWindowAddonBrowser::OnJobComplete(unsigned int jobID, TOAST_DISPLAY_TIME,false); } } + else + { + CStdString addonID = CUtil::GetFileName(strFolder); + ReportInstallError(addonID, addonID); + CLog::Log(LOGERROR,"Could not read addon description of %s", addonID.c_str()); + CFileItemList list; + list.Add(CFileItemPtr(new CFileItem(strFolder, true))); + list[0]->Select(true); + CJobManager::GetInstance().AddJob(new CFileOperationJob(CFileOperationJob::ActionDelete, list, ""), this); + } } } } -- 1.7.3