Change theme download message to say "devel" instead of "trunk".

MythTV · Feb 21, 2025 · e9e3a4e · e9e3a4e
1 parent bae83aa
commit e9e3a4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/mythtv/programs/mythbackend/backendhousekeeper.cpp b/mythtv/programs/mythbackend/backendhousekeeper.cpp
@@ -346,7 +346,7 @@ bool ThemeUpdateTask::DoRun(void)
 
     if (!parsed || devel)
     {
-        LOG(VB_GENERAL, LOG_INFO, QString("Loading themes for trunk"));
+        LOG(VB_GENERAL, LOG_INFO, QString("Loading themes for devel"));
         result |= LoadVersion("trunk", LOG_ERR);
     }
     else

diff --git a/mythtv/programs/mythfrontend/themechooser.cpp b/mythtv/programs/mythfrontend/themechooser.cpp
@@ -176,9 +176,9 @@ void ThemeChooser::Load(void)
     {
         if (!parsed)
             LOG(VB_GENERAL, LOG_ERR,
-                QString("Invalid MythTV version %1, will use themes from trunk")
+                QString("Invalid MythTV version %1, will use themes from devel")
                 .arg(GetMythSourceVersion()));
-        LOG(VB_GUI, LOG_INFO, QString("Loading themes for trunk"));
+        LOG(VB_GUI, LOG_INFO, QString("Loading themes for devel"));
         LoadVersion("trunk", themesSeen, true);
     }
     else
@@ -202,11 +202,10 @@ void ThemeChooser::Load(void)
         else
         {
 
-            LOG(VB_GENERAL, LOG_INFO, QString("Failed to load themes for %1, trying trunk").arg(MythVersion));
-            MythVersion = "trunk";
-            if (!LoadVersion(MythVersion, themesSeen, true))
+            LOG(VB_GENERAL, LOG_INFO, QString("Failed to load themes for %1, trying devel").arg(MythVersion));
+            if (!LoadVersion("trunk", themesSeen, true))
             {
-                LOG(VB_GENERAL, LOG_WARNING, QString("Failed to load themes for %1").arg(MythVersion));
+                LOG(VB_GENERAL, LOG_WARNING, QString("Failed to load themes for devel"));
             }
         }
     }