godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change OS::initialize signature to return Error (fix segfault on x11)

Browse Source
This commit is contained in:
Emmanuel Leblond
2018-01-03 18:26:44 +01:00
committed by Rémi Verschelde
parent 99eb394a5f
commit e315c94900
21 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/main.cpp
View File

@@ -983,7 +983,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
Thread::_main_thread_id = p_main_tid_override;
}
OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx);
Error err = OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx);
if (err != OK) {
return err;
}
if (init_use_custom_pos) {
OS::get_singleton()->set_window_position(init_custom_pos);
}