diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-04-03 09:39:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-03 09:39:29 +0200 |
commit | 4a65e69296a2daa60bb6d0fe2f61b181f54a4e03 (patch) | |
tree | 8d1a626024c9c6e1f9104e66356e078e26152f71 | |
parent | 8f7f5846397297fff6e8a08f89bc60ce658699cc (diff) | |
parent | c158a63a8af668eac20ed303b1f8c02b6831a983 (diff) |
Merge pull request #47571 from lucicam/master
Fix crash caused by null parameter passed to CameraServer.add_feed()
-rw-r--r-- | servers/camera_server.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/servers/camera_server.cpp b/servers/camera_server.cpp index b06f32417c..ee4a2e148b 100644 --- a/servers/camera_server.cpp +++ b/servers/camera_server.cpp @@ -99,6 +99,8 @@ Ref<CameraFeed> CameraServer::get_feed_by_id(int p_id) { }; void CameraServer::add_feed(const Ref<CameraFeed> &p_feed) { + ERR_FAIL_COND(p_feed.is_null()); + // add our feed feeds.push_back(p_feed); |