thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

synced with scummvm svn rev 53000

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-04-11 15:40:01 +02:00
parent 886c17d130
commit 241c7a8c6e
116 changed files with 104334 additions and 1926 deletions
Download patch file Download diff file Expand all files Collapse all files

5
base/main.cpp
View file

@ -307,9 +307,6 @@ extern "C" int residual_main(int argc, const char * const argv[]) {
// Update the config file
ConfMan.set("versioninfo", gResidualVersion, Common::ConfigManager::kApplicationDomain);
// Enable translation
TransMan.setLanguage(ConfMan.get("gui_language").c_str());
// Load and setup the debuglevel and the debug flags. We do this at the
// soonest possible moment to ensure debug output starts early on, if
// requested.
@ -333,7 +330,7 @@ extern "C" int residual_main(int argc, const char * const argv[]) {
// On the other hand we cannot load the plugins before we know the file paths (in case of external plugins).
if (settings.contains("music-driver")) {
if (MidiDriver::getMusicType(MidiDriver::getDeviceHandle(settings["music-driver"])) == MT_INVALID) {
warning("Unrecognized music driver '%s'. Switching to default device.", settings["music-driver"].c_str());
warning("Unrecognized music driver '%s'. Switching to default device", settings["music-driver"].c_str());
settings["music-driver"] = "auto";
}
}