summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Hurlbut <ghurlbut@mythtv.org>2011-05-29 04:17:50 (GMT)
committer Gavin Hurlbut <ghurlbut@mythtv.org>2011-05-29 04:43:24 (GMT)
commit8e4a3c3e86edc4291097c62bc6d98ef08792c547 (patch)
tree8395b77ebf9718ba589c7d07fa99cb61a53180cf
parent1605466620e84e1ce25394afc3911e89b21a18ea (diff)
Change the heuristic to only skip animation for myth://
This should allow local files that aren't using full pathnames to be animated Refs #9428 (cherry picked from commit 5aca501286791d8b10d1708ba4e777e4accc8196)
-rw-r--r--mythtv/libs/libmythui/mythuiimage.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/mythtv/libs/libmythui/mythuiimage.cpp b/mythtv/libs/libmythui/mythuiimage.cpp
index c3c3667..3ffd4e6 100644
--- a/mythtv/libs/libmythui/mythuiimage.cpp
+++ b/mythtv/libs/libmythui/mythuiimage.cpp
@@ -85,10 +85,7 @@ class ImageLoadThread : public QRunnable
void run()
{
QString tmpFilename;
- if ((m_filename.startsWith("/")) ||
- (m_filename.startsWith("http://")) ||
- (m_filename.startsWith("https://")) ||
- (m_filename.startsWith("ftp://")))
+ if (!(m_filename.startsWith("myth://")))
tmpFilename = m_filename;
MythImageReader imageReader(tmpFilename);
@@ -673,10 +670,7 @@ bool MythUIImage::Load(bool allowLoadInBackground, bool forceStat)
VERBOSE(VB_GUI|VB_FILE|VB_EXTRA, LOC + QString(
"Load(), loading '%1' in foreground").arg(filename));
QString tmpFilename;
- if ((filename.startsWith("/")) ||
- (filename.startsWith("http://")) ||
- (filename.startsWith("https://")) ||
- (filename.startsWith("ftp://")))
+ if (!(filename.startsWith("myth://")))
tmpFilename = filename;
MythImageReader imageReader(tmpFilename);