diff options
Diffstat (limited to 'servers/camera_server.cpp')
-rw-r--r-- | servers/camera_server.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/servers/camera_server.cpp b/servers/camera_server.cpp index 3caea6b7c3..6f506d0f7a 100644 --- a/servers/camera_server.cpp +++ b/servers/camera_server.cpp @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -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); @@ -108,7 +110,7 @@ void CameraServer::add_feed(const Ref<CameraFeed> &p_feed) { #endif // let whomever is interested know - emit_signal("camera_feed_added", p_feed->get_id()); + emit_signal(SNAME("camera_feed_added"), p_feed->get_id()); }; void CameraServer::remove_feed(const Ref<CameraFeed> &p_feed) { @@ -125,7 +127,7 @@ void CameraServer::remove_feed(const Ref<CameraFeed> &p_feed) { feeds.remove(i); // let whomever is interested know - emit_signal("camera_feed_removed", feed_id); + emit_signal(SNAME("camera_feed_removed"), feed_id); return; }; }; |