northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions 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

4
platform/android/os_android.cpp
View File

@ -120,7 +120,7 @@ void OS_Android::set_opengl_extensions(const char *p_gl_extensions) {
gl_extensions = p_gl_extensions;
}
void OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
use_gl2 = p_video_driver != 1;
@ -146,6 +146,8 @@ void OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int
input->set_fallback_mapping("Default Android Gamepad");
//power_manager = memnew(power_android);
return OK;
}
void OS_Android::set_main_loop(MainLoop *p_main_loop) {