Skip to content

Commit

Permalink
Treat 'devel/*' branches as 'master' in the ThemeChooser
Browse files Browse the repository at this point in the history
If we assume that devel/* branches are up to date with master,
this will allow devel/* users to download and install themes
if they choose.
  • Loading branch information
cpinkham committed Jun 14, 2013
1 parent c8cd017 commit 0474e02
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions mythtv/programs/mythfrontend/themechooser.cpp
Expand Up @@ -154,6 +154,10 @@ void ThemeChooser::Load(void)
themes.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
themes.setSorting(QDir::Name | QDir::IgnoreCase);

// Treat devel branches as master
if (MythVersion.startsWith("devel/"))
MythVersion = "master";

// FIXME: For now, treat git master the same as svn trunk
if (MythVersion == "master")
MythVersion = "trunk";
Expand Down Expand Up @@ -881,6 +885,10 @@ ThemeUpdateChecker::ThemeUpdateChecker() :
{
m_mythVersion = MYTH_SOURCE_PATH;

// Treat devel branches as master
if (m_mythVersion.startsWith("devel/"))
m_mythVersion = "master";

// FIXME: For now, treat git master the same as svn trunk
if (m_mythVersion == "master")
m_mythVersion = "trunk";
Expand Down

0 comments on commit 0474e02

Please sign in to comment.