Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix limiting of recentlyAdded on homewindow.

  • Loading branch information...
commit 32f8b6d04dbf4db8298deed329dc47bc7cebbf88 1 parent ab25708
@tru tru authored
Showing with 11 additions and 9 deletions.
  1. +6 −7 plex/Owned/GUIWindowHome.cpp
  2. +5 −2 xbmc/utils/UrlOptions.h
View
13 plex/Owned/GUIWindowHome.cpp
@@ -198,17 +198,16 @@ void CPlexSectionFanout::Refresh()
trueUrl.SetOption("X-Plex-Container-Size", "20");
#endif
- CURL recentlyAdded(trueUrl);
- recentlyAdded.SetOption("unwatched", "1");
- recentlyAdded.SetFileName(PlexUtils::AppendPathToURL(recentlyAdded.GetFileName(), "recentlyAdded"));
+ trueUrl.SetOption("unwatched", "1");
+ trueUrl.SetFileName(PlexUtils::AppendPathToURL(trueUrl.GetFileName(), "recentlyAdded"));
- m_outstandingJobs.push_back(LoadSection(recentlyAdded.Get(), CONTENT_LIST_RECENTLY_ADDED));
+ m_outstandingJobs.push_back(LoadSection(trueUrl.Get(), CONTENT_LIST_RECENTLY_ADDED));
if (m_sectionType == PLEX_METADATA_MOVIE || m_sectionType == PLEX_METADATA_SHOW)
{
- CURL onDeck(trueUrl);
- onDeck.SetFileName(PlexUtils::AppendPathToURL(onDeck.GetFileName(), "onDeck"));
- m_outstandingJobs.push_back(LoadSection(onDeck.Get(), CONTENT_LIST_ON_DECK));
+ trueUrl = CURL(m_url);
+ trueUrl.SetFileName(PlexUtils::AppendPathToURL(trueUrl.GetFileName(), "onDeck"));
+ m_outstandingJobs.push_back(LoadSection(trueUrl.Get(), CONTENT_LIST_ON_DECK));
}
}
View
7 xbmc/utils/UrlOptions.h
@@ -34,9 +34,12 @@ struct PlexUrlComp : std::binary_function<std::string, std::string, bool>
{
bool operator() (const std::string& a, const std::string& b) const
{
- if(a.find("X-Plex") != std::string::npos)
+ if(a.find("X-Plex") != std::string::npos &&
+ b.find("X-Plex") == std::string::npos)
return false;
- if(b.find("X-Plex") != std::string::npos)
+
+ else if(b.find("X-Plex") != std::string::npos &&
+ a.find("X-Plex") == std::string::npos)
return true;
#ifndef TARGET_WINDOWS
Please sign in to comment.
Something went wrong with that request. Please try again.