Index: libs/libmyth/mythcontext.cpp
===================================================================
--- libs/libmyth/mythcontext.cpp	(revision 9780)
+++ libs/libmyth/mythcontext.cpp	(working copy)
@@ -1881,17 +1881,27 @@
     bool found = false;
     QString value = defaultval;
 
-    if (d && d->useSettingsCache)
-    {
+    if (d) {
         QString myKey = host + " " + key;
-        d->settingsCacheLock.lock();
-        if (d->settingsCache.contains(myKey))
+
+        // By putting this code here, we override settings even when we're
+        // not using the settings cache.
+        if (d->overriddenSettings.contains(myKey)) {
+            value = d->overriddenSettings[myKey];
+            return value;
+        }
+
+        if (d->useSettingsCache)
         {
-            value = d->settingsCache[myKey];
+            d->settingsCacheLock.lock();
+            if (d->settingsCache.contains(myKey))
+            {
+                value = d->settingsCache[myKey];
+                d->settingsCacheLock.unlock();
+                return value;
+            }
             d->settingsCacheLock.unlock();
-            return value;
         }
-        d->settingsCacheLock.unlock();
     }
 
     MSqlQuery query(MSqlQuery::InitCon());