Ticket #72: default_theme_no_warning.diff

File default_theme_no_warning.diff, 948 bytes (added by Korey <k.m.fort@…>, 15 years ago)

This diff does the same thing with exception of not producing warnings of reaching the end non-void statement without return.

  • mythcontext.cpp

     
    13961396    if (dir.exists())
    13971397        return testdir;
    13981398
    1399     testdir = "../menutest/" + themename;
     1399    testdir = d->m_installprefix + "/share/mythtv/themes/G.A.N.T.";
    14001400    dir.setPath(testdir);
    1401     if (dir.exists())
     1401    if (dir.exists()){
     1402        cerr<<"Defaulting to G.A.N.T. theme"<<endl;
    14021403        return testdir;
     1404        }
    14031405
    14041406
    14051407    // Don't complain about the "default" theme being missing
     
    14091411        dir.setPath(testdir);
    14101412        if (dir.exists())
    14111413            return testdir;
    1412     }
    1413    
    1414     cerr << "Could not find theme: " << themename << endl;
    1415     return "";
     1414        dir.setPath(testdir);
     1415        cerr << "Could not find theme: " << themename << endl;
     1416        exit(1);
     1417        }
    14161418}
    14171419QString MythContext::GetMenuThemeDir(void)
    14181420{