diff options
| author | Emmanuel Leblond <emmanuel.leblond@gmail.com> | 2018-01-03 18:26:44 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-01-04 15:15:55 +0100 |
| commit | e315c94900be47e61152a2958011e14b7e635a3e (patch) | |
| tree | 9fbe974664cd253d3fdd0792db0b7b5f91cfcde6 /core/os | |
| parent | 99eb394a5f5f164a562e315980cb730a704a0a1c (diff) | |
Change OS::initialize signature to return Error (fix segfault on x11)
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/os.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/os.h b/core/os/os.h index c9c228cfaf..a4f07df0e8 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -121,7 +121,7 @@ protected: void add_logger(Logger *p_logger); virtual void initialize_core() = 0; - virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) = 0; + virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) = 0; virtual void set_main_loop(MainLoop *p_main_loop) = 0; virtual void delete_main_loop() = 0; |