Fix Theme Chooser downloading on remote frontends.

This fixes theme downloading on remote frontends and also fixes an issue with the Theme Chooser not reloading the theme once it has downloaded.
MythTV · Jun 22, 2011 · caea1c7 · caea1c7
1 parent f711743
commit caea1c7
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mythtv/programs/mythfrontend/themechooser.cpp b/mythtv/programs/mythfrontend/themechooser.cpp
@@ -615,7 +615,7 @@ void ThemeChooser::saveAndReload(MythUIButtonListItem *item)
     else
     {
         gCoreContext->SaveSetting("Theme", info->GetDirectoryName());
-        GetMythMainWindow()->JumpTo("Reload Theme");
+        GetMythMainWindow()->JumpTo("Reload Theme", false);
     }
 }
 
@@ -734,15 +734,17 @@ void ThemeChooser::customEvent(QEvent *e)
                         if (file.exists())
                         {
                             remoteFileIsLocal = true;
+                            m_downloadFile = localFile;
                         }
                         else
                         {
                             GetMythDownloadManager()->queueDownload(
                                 m_downloadFile, localFile, this);
                             OpenBusyPopup(tr("Copying %1 Theme Package")
                                           .arg(m_downloadTheme->GetName()));
+                            m_downloadFile = localFile;
+                            return;
                         }
-                        m_downloadFile = localFile;
                     }
                     else
                     {
@@ -793,7 +795,7 @@ void ThemeChooser::customEvent(QEvent *e)
             SendMythSystemEvent(event);
 
             gCoreContext->SaveSetting("Theme", m_downloadTheme->GetDirectoryName());
-            GetMythMainWindow()->JumpTo("Reload Theme");
+            GetMythMainWindow()->JumpTo("Reload Theme", false);
         }
     }
 }