diff options
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 19fe037613..68c40a6f2b 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; } { @@ -1319,6 +1321,7 @@ bool Main::start() { } } } + OS::get_singleton()->set_context(OS::CONTEXT_EDITOR); //editor_node->set_edited_scene(game); } else { @@ -1463,6 +1466,7 @@ bool Main::start() { ProjectManager *pmanager = memnew( ProjectManager ); sml->get_root()->add_child(pmanager); + OS::get_singleton()->set_context(OS::CONTEXT_PROJECTMAN); } #endif |