diff options
| -rw-r--r-- | xbmc/TextureCacheJob.cpp | 3 | ||||
| -rw-r--r-- | xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xbmc/TextureCacheJob.cpp b/xbmc/TextureCacheJob.cpp index b28a66901c..ebbab151f1 100644 --- a/xbmc/TextureCacheJob.cpp +++ b/xbmc/TextureCacheJob.cpp @@ -235,6 +235,9 @@ std::string CTextureCacheJob::GetImageHash(const std::string &url) if (time || st.st_size) return StringUtils::Format("d%" PRId64"s%" PRId64, time, st.st_size);; + // the image exists but we couldn't determine the mtime/ctime and/or size + // so set an obviously bad hash + return "BADHASH"; } CLog::Log(LOGDEBUG, "%s - unable to stat url %s", __FUNCTION__, url.c_str()); return ""; diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp index dde23a6cbc..d54e1a3027 100644 --- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp @@ -1332,7 +1332,7 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) // set the tv vendor override int iVendor = GetSettingInt("tv_vendor"); - if (iVendor >= CEC_MAX_VENDORID && + if (iVendor >= CEC_MIN_VENDORID && iVendor <= CEC_MAX_VENDORID) m_configuration.tvVendor = iVendor; |