Răsfoiți Sursa

Merge pull request #10988 from marcelofg55/2.1

Fix crash when editing SampleLibrary with broken dependencies
Rémi Verschelde 8 ani în urmă
părinte
comite
792d1694c5

+ 3 - 0
editor/plugins/sample_editor_plugin.cpp

@@ -69,6 +69,9 @@ void SampleEditor::_stop_pressed() {
 
 void SampleEditor::generate_preview_texture(const Ref<Sample> &p_sample, Ref<ImageTexture> &p_texture) {
 
+	if (p_sample == NULL)
+		return;
+
 	DVector<uint8_t> data = p_sample->get_data();
 
 	DVector<uint8_t> img;

+ 1 - 1
editor/plugins/sample_library_editor_plugin.cpp

@@ -238,7 +238,7 @@ void SampleLibraryEditor::_update_library() {
 		ti->set_cell_mode(2, TreeItem::CELL_MODE_STRING);
 		ti->set_editable(2, false);
 		ti->set_selectable(2, false);
-		ti->set_text(2, String() + (smp->get_format() == Sample::FORMAT_PCM16 ? TTR("16 Bits") + ", " : (smp->get_format() == Sample::FORMAT_PCM8 ? TTR("8 Bits") + ", " : "IMA-ADPCM,")) + (smp->is_stereo() ? TTR("Stereo") : TTR("Mono")));
+		ti->set_text(2, String() + (smp != NULL ? (smp->get_format() == Sample::FORMAT_PCM16 ? TTR("16 Bits") + ", " : (smp->get_format() == Sample::FORMAT_PCM8 ? TTR("8 Bits") + ", " : "IMA-ADPCM,")) + (smp->is_stereo() ? TTR("Stereo") : TTR("Mono")) : TTR("Invalid")));
 
 		// Volume dB
 		ti->set_cell_mode(3, TreeItem::CELL_MODE_RANGE);