Ticket #72: default_theme_no_warning.diff

mythcontext.cpp

@@ -1396 +1396 @@
     if (dir.exists())
         return testdir;
 
-    testdir = "../menutest/" + themename;
+    testdir = d->m_installprefix + "/share/mythtv/themes/G.A.N.T.";
     dir.setPath(testdir);
-    if (dir.exists())
+    if (dir.exists()){
+        cerr<<"Defaulting to G.A.N.T. theme"<<endl;
         return testdir;
+        }
 
 
     // Don't complain about the "default" theme being missing
@@ -1409 +1411 @@
         dir.setPath(testdir);
         if (dir.exists())
             return testdir;
-    }
-    
-    cerr << "Could not find theme: " << themename << endl;
-    return "";
+        dir.setPath(testdir);
+        cerr << "Could not find theme: " << themename << endl;
+        exit(1);
+        }
 }
 QString MythContext::GetMenuThemeDir(void)
 {