Skip to content
Browse files

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.
  • Loading branch information...
1 parent f711743 commit caea1c7d71298a670132040b6cb5a2fa493ce65e @cpinkham cpinkham committed Jun 22, 2011
Showing with 5 additions and 3 deletions.
  1. +5 −3 mythtv/programs/mythfrontend/themechooser.cpp
View
8 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);
}
}
}

0 comments on commit caea1c7

Please sign in to comment.
Something went wrong with that request. Please try again.