From 3e8da09d2087852e7c0df4e0ae0dfc879ddc2ce5 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Fri, 15 Apr 2016 07:06:02 -0700 Subject: [pictures] Remove early return --- xbmc/pictures/GUIWindowPictures.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp index 2197079c0d..190a7d9ab3 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp @@ -114,11 +114,6 @@ bool CGUIWindowPictures::OnMessage(CGUIMessage& message) message.SetStringParam(CMediaSourceSettings::GetInstance().GetDefaultSource("pictures")); m_dlgProgress = (CGUIDialogProgress*)g_windowManager.GetWindow(WINDOW_DIALOG_PROGRESS); - - if (!CGUIMediaWindow::OnMessage(message)) - return false; - - return true; } break; -- cgit v1.2.3 From e1045a0e6ca91269b2ae0dc5b78c2a742ef1a3ae Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Fri, 15 Apr 2016 07:09:20 -0700 Subject: [pictures] Remove unneeded out-of-bounds check --- xbmc/pictures/GUIWindowPictures.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp index 190a7d9ab3..8bf38177bd 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp @@ -582,7 +582,7 @@ void CGUIWindowPictures::LoadPlayList(const std::string& strPlayList) void CGUIWindowPictures::OnItemInfo(int itemNumber) { - CFileItemPtr item = (itemNumber >= 0 && itemNumber < m_vecItems->Size()) ? m_vecItems->Get(itemNumber) : CFileItemPtr(); + CFileItemPtr item = m_vecItems->Get(itemNumber); if (!item) return; if (!m_vecItems->IsPlugin() && (item->IsPlugin() || item->IsScript())) -- cgit v1.2.3 From 0ea64c447f6e601319920c9e3d08e986d304ba82 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Fri, 15 Apr 2016 07:14:29 -0700 Subject: [pictures] cosmetic: improve readability of start folder check --- xbmc/pictures/GUIWindowPictures.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp index 8bf38177bd..c68371900d 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp @@ -602,8 +602,8 @@ void CGUIWindowPictures::OnItemInfo(int itemNumber) std::string CGUIWindowPictures::GetStartFolder(const std::string &dir) { - std::string lower(dir); StringUtils::ToLower(lower); - if (lower == "plugins" || lower == "addons") + if (StringUtils::EqualsNoCase(dir, "plugins") || + StringUtils::EqualsNoCase(dir, "addons")) return "addons://sources/image/"; SetupShares(); -- cgit v1.2.3 From c5459bcef58d97b2febb249ee970dd9c9afadd13 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Fri, 15 Apr 2016 09:59:32 -0700 Subject: [pictures] cosmetic: improve readability of start folder check --- xbmc/windows/GUIMediaWindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp index 25fa402c77..a5645d36ad 100644 --- a/xbmc/windows/GUIMediaWindow.cpp +++ b/xbmc/windows/GUIMediaWindow.cpp @@ -1990,9 +1990,10 @@ bool CGUIMediaWindow::Filter(bool advanced /* = true */) std::string CGUIMediaWindow::GetStartFolder(const std::string &dir) { - std::string lower(dir); StringUtils::ToLower(lower); - if (lower == "$root" || lower == "root") + if (StringUtils::EqualsNoCase(dir, "$root") || + StringUtils::EqualsNoCase(dir, "root")) return ""; + return dir; } -- cgit v1.2.3 From 4965b7865406c6e23dcea6b2e0f799007a239d2c Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Fri, 15 Apr 2016 07:37:33 -0700 Subject: [pictures] Guard against source type not existing and cosmetics --- xbmc/pictures/GUIViewStatePictures.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xbmc/pictures/GUIViewStatePictures.cpp b/xbmc/pictures/GUIViewStatePictures.cpp index a04f5a7963..0cfe803a42 100644 --- a/xbmc/pictures/GUIViewStatePictures.cpp +++ b/xbmc/pictures/GUIViewStatePictures.cpp @@ -82,8 +82,20 @@ std::string CGUIViewStateWindowPictures::GetExtensions() VECSOURCES& CGUIViewStateWindowPictures::GetSources() { VECSOURCES *pictureSources = CMediaSourceSettings::GetInstance().GetSources("pictures"); + + // Guard against source type not existing + if (pictureSources == nullptr) + { + static VECSOURCES empty; + return empty; + } + + // Picture add-ons AddAddonsSource("image", g_localizeStrings.Get(1039), "DefaultAddonPicture.png"); + + // Global sources AddOrReplace(*pictureSources, CGUIViewState::GetSources()); + return *pictureSources; } -- cgit v1.2.3