Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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)
  • Loading branch information...
commit 8e4a3c3e86edc4291097c62bc6d98ef08792c547 1 parent 1605466
@Beirdo Beirdo authored
Showing with 2 additions and 8 deletions.
  1. +2 −8 mythtv/libs/libmythui/mythuiimage.cpp
View
10 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);
Please sign in to comment.
Something went wrong with that request. Please try again.