Просмотр исходного кода

Merge pull request #870 from kkartaltepe/feature-free-type-data

libobs: Remove multiple calls to free_type_data
Hugh Bailey ("Jim") 8 лет назад
Родитель
Сommit
54805fe55d
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      libobs/obs.c

+ 4 - 3
libobs/obs.c

@@ -818,9 +818,6 @@ void obs_shutdown(void)
 	} while (false)
 
 	FREE_REGISTERED_TYPES(obs_source_info, obs->source_types);
-	FREE_REGISTERED_TYPES(obs_source_info, obs->input_types);
-	FREE_REGISTERED_TYPES(obs_source_info, obs->filter_types);
-	FREE_REGISTERED_TYPES(obs_source_info, obs->transition_types);
 	FREE_REGISTERED_TYPES(obs_output_info, obs->output_types);
 	FREE_REGISTERED_TYPES(obs_encoder_info, obs->encoder_types);
 	FREE_REGISTERED_TYPES(obs_service_info, obs->service_types);
@@ -829,6 +826,10 @@ void obs_shutdown(void)
 
 #undef FREE_REGISTERED_TYPES
 
+	da_free(obs->input_types);
+	da_free(obs->filter_types);
+	da_free(obs->transition_types);
+
 	stop_video();
 	stop_hotkeys();