summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-07-20 19:16:54 +0000
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-07-20 19:16:54 +0000
commite4936e67782f6b41901deee9ed0a1deabf8f2068 (patch)
tree754c0e7ef517a61f96deb53a4f199ccdcab7600d /pages
parentcd961ae77617800bb007874a8ef788cb70debccb (diff)
downloadvdr-plugin-live-e4936e67782f6b41901deee9ed0a1deabf8f2068.tar.gz
vdr-plugin-live-e4936e67782f6b41901deee9ed0a1deabf8f2068.tar.bz2
- Make AJAX work when no 'epgImages' path has been specified.
Diffstat (limited to 'pages')
-rw-r--r--pages/content.ecpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/pages/content.ecpp b/pages/content.ecpp
index ec6f5b8..5f1780a 100644
--- a/pages/content.ecpp
+++ b/pages/content.ecpp
@@ -24,14 +24,17 @@ reply.setContentType(mime);
// dsyslog("vdrlive::content::mimetype(%s)", mime.c_str());
// FileCache::ptr_type f = LiveFileCache().get("/tmp/live/" + request.getPathInfo());
-string path(request.getPathInfo());
+string const path(request.getPathInfo());
FileCache::ptr_type f;
-if (path.find(LiveSetup().GetEpgImageDir()) != 0)
- f = LiveFileCache().get(Plugin::GetConfigDirectory() + "/" + path);
-else
+string const epgImgPath(LiveSetup().GetEpgImageDir());
+if (!epgImgPath.empty() && path.find(epgImgPath) != string::npos) {
f = LiveFileCache().get(path);
+}
+else {
+ f = LiveFileCache().get(Plugin::GetConfigDirectory() + "/" + path);
+}
if (f.get() == 0) {
return DECLINED;