Skip to content

Commit 0d1d3ea

Browse files
committed
Merge pull request #108381 from timothyqiu/shader-side-toggle
Fix error when "Toggle Files Panel" in shader editor
2 parents ad4e7a0 + b9657ad commit 0d1d3ea

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

editor/shader/shader_editor_plugin.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -635,14 +635,16 @@ void ShaderEditorPlugin::_menu_item_pressed(int p_index) {
635635
shader_list->set_visible(!shader_list->is_visible());
636636

637637
int index = shader_tabs->get_current_tab();
638-
ERR_FAIL_INDEX(index, shader_tabs->get_tab_count());
639-
TextShaderEditor *editor = Object::cast_to<TextShaderEditor>(edited_shaders[index].shader_editor);
640-
if (editor) {
641-
editor->get_code_editor()->update_toggle_files_button();
642-
} else {
643-
VisualShaderEditor *vs_editor = Object::cast_to<VisualShaderEditor>(edited_shaders[index].shader_editor);
644-
if (vs_editor) {
645-
vs_editor->update_toggle_files_button();
638+
if (index != -1) {
639+
ERR_FAIL_INDEX(index, (int)edited_shaders.size());
640+
TextShaderEditor *editor = Object::cast_to<TextShaderEditor>(edited_shaders[index].shader_editor);
641+
if (editor) {
642+
editor->get_code_editor()->update_toggle_files_button();
643+
} else {
644+
VisualShaderEditor *vs_editor = Object::cast_to<VisualShaderEditor>(edited_shaders[index].shader_editor);
645+
if (vs_editor) {
646+
vs_editor->update_toggle_files_button();
647+
}
646648
}
647649
}
648650
} break;

0 commit comments

Comments
 (0)