diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-27 01:05:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-27 01:05:18 +0200 |
commit | eaaff9da3178fa515a0f051fda932c1dd04d53db (patch) | |
tree | 56173535c376e0324f89baccf4bc14b2580ead23 /editor/rename_dialog.cpp | |
parent | d8c96461183f0dc3208c3d624674fa4544212ea5 (diff) | |
parent | 4e5310cc60dc17e5ef09e57115ca8236544679e4 (diff) | |
download | redot-engine-eaaff9da3178fa515a0f051fda932c1dd04d53db.tar.gz |
Merge pull request #29941 from qarmin/redundant_code_and_others
Remove redundant code, possible NULL pointers and others
Diffstat (limited to 'editor/rename_dialog.cpp')
-rw-r--r-- | editor/rename_dialog.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 858b14a733..40343cf908 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -475,17 +475,17 @@ String RenameDialog::_substitute(const String &subject, const Node *node, int co if (root_node) { result = result.replace("${ROOT}", root_node->get_name()); } - - Node *parent_node = node->get_parent(); - if (parent_node) { - if (node == root_node) { - // Can not substitute parent of root. - result = result.replace("${PARENT}", ""); - } else { - result = result.replace("${PARENT}", parent_node->get_name()); + if (node) { + Node *parent_node = node->get_parent(); + if (parent_node) { + if (node == root_node) { + // Can not substitute parent of root. + result = result.replace("${PARENT}", ""); + } else { + result = result.replace("${PARENT}", parent_node->get_name()); + } } } - return result; } |