summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Pinkham <cpinkham@mythtv.org>2011-06-22 04:32:17 (GMT)
committer Chris Pinkham <cpinkham@mythtv.org>2011-06-22 04:32:17 (GMT)
commitcaea1c7d71298a670132040b6cb5a2fa493ce65e (patch)
treefc8f0380bed0163335299726bf8e8e195c67346e
parentf711743147e12f9203eefccca059ed2099a92135 (diff)
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.
-rw-r--r--mythtv/programs/mythfrontend/themechooser.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/mythtv/programs/mythfrontend/themechooser.cpp b/mythtv/programs/mythfrontend/themechooser.cpp
index 9d509dd..0d1bf15 100644
--- 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,6 +734,7 @@ void ThemeChooser::customEvent(QEvent *e)
if (file.exists())
{
remoteFileIsLocal = true;
+ m_downloadFile = localFile;
}
else
{
@@ -741,8 +742,9 @@ void ThemeChooser::customEvent(QEvent *e)
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);
}
}
}