File tree 2 files changed +12
-0
lines changed
2 files changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -52,6 +52,9 @@ void CameraLinux::_update_devices() {
52
52
53
53
for (int i = feeds.size () - 1 ; i >= 0 ; i--) {
54
54
Ref<CameraFeedLinux> feed = (Ref<CameraFeedLinux>)feeds[i];
55
+ if (feed.is_null ()) {
56
+ continue ;
57
+ }
55
58
String device_name = feed->get_device_name ();
56
59
if (!_is_active (device_name)) {
57
60
remove_feed (feed);
@@ -84,6 +87,9 @@ void CameraLinux::_update_devices() {
84
87
bool CameraLinux::_has_device (const String &p_device_name) {
85
88
for (int i = 0 ; i < feeds.size (); i++) {
86
89
Ref<CameraFeedLinux> feed = (Ref<CameraFeedLinux>)feeds[i];
90
+ if (feed.is_null ()) {
91
+ continue ;
92
+ }
87
93
if (feed->get_device_name () == p_device_name) {
88
94
return true ;
89
95
}
Original file line number Diff line number Diff line change @@ -323,6 +323,9 @@ - (void)dealloc {
323
323
// remove devices that are gone..
324
324
for (int i = feeds.size () - 1 ; i >= 0 ; i--) {
325
325
Ref<CameraFeedMacOS> feed = (Ref<CameraFeedMacOS>)feeds[i];
326
+ if (feed.is_null ()) {
327
+ continue ;
328
+ }
326
329
327
330
if (![devices containsObject: feed->get_device ()]) {
328
331
// remove it from our array, this will also destroy it ;)
@@ -334,6 +337,9 @@ - (void)dealloc {
334
337
bool found = false ;
335
338
for (int i = 0 ; i < feeds.size () && !found; i++) {
336
339
Ref<CameraFeedMacOS> feed = (Ref<CameraFeedMacOS>)feeds[i];
340
+ if (feed.is_null ()) {
341
+ continue ;
342
+ }
337
343
if (feed->get_device () == device) {
338
344
found = true ;
339
345
};
You can’t perform that action at this time.
0 commit comments