diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-31 18:47:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-31 18:47:13 -0300 |
| commit | 0364d6b076cfc4e75985731b67f8155bf173dd06 (patch) | |
| tree | 206418f0d9acde396c7874b524928cdc13f08550 /main/main.cpp | |
| parent | dbcca7bea28482fd26be5ff49bb4eecc0e4bdf1b (diff) | |
do not fail on invalid audio driver, fixes #3466
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 19fe037613..f8786f5aec 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -726,8 +726,9 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas /* Determine Video Driver */ - if (audio_driver=="") // specified in engine.cfg + if (audio_driver=="") { // specified in engine.cfg audio_driver=GLOBAL_DEF("audio/driver",OS::get_singleton()->get_audio_driver_name(0)); + } for (int i=0;i<OS::get_singleton()->get_video_driver_count();i++) { @@ -758,7 +759,8 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (audio_driver_idx<0) { OS::get_singleton()->alert( "Invalid Audio Driver: "+audio_driver ); - goto error; + audio_driver_idx = 0; + //goto error; } { |