diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-17 09:58:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 09:58:24 +0200 |
| commit | e30a137548dce0fe1f5eda223b900fcbdd2631b8 (patch) | |
| tree | 18d4a68f6938f35329b2f831ab9c3ce028d24d5e | |
| parent | 1d13567345c6966f351437dc901af7ae375016d3 (diff) | |
| parent | 0584911f9fcce8ab79a50a99a5eff0a8e2f32bce (diff) | |
Merge pull request #30633 from creikey/fix-headless-export-crash
Fix headless export crash
| -rw-r--r-- | platform/server/os_server.cpp | 4 | ||||
| -rw-r--r-- | platform/server/os_server.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 12e53054bc..87dc6421ac 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -88,6 +88,8 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int visual_server = memnew(VisualServerRaster); visual_server->init(); + camera_server = memnew(CameraServer); + AudioDriverManager::initialize(p_audio_driver); input = memnew(InputDefault); @@ -117,6 +119,8 @@ void OS_Server::finalize() { memdelete(input); + memdelete(camera_server); + memdelete(power_manager); ResourceLoader::remove_resource_format_loader(resource_loader_dummy); diff --git a/platform/server/os_server.h b/platform/server/os_server.h index e3488a693d..dbdae6afb1 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -74,6 +74,7 @@ class OS_Server : public OS_Unix { #endif CrashHandler crash_handler; + CameraServer *camera_server; int video_driver_index; |