Skip to content

Commit

Permalink
Check if setting exists to prevent warning
Browse files Browse the repository at this point in the history
  • Loading branch information
DrNochi committed Nov 16, 2018
1 parent 26d33d1 commit 911d3a4
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions editor/editor_data.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -946,16 +946,18 @@ void EditorData::script_class_save_icon_paths() {
void EditorData::script_class_load_icon_paths() {
script_class_clear_icon_paths();

Dictionary d = ProjectSettings::get_singleton()->get("_global_script_class_icons");
List<Variant> keys;
d.get_key_list(&keys);
if (ProjectSettings::get_singleton()->has_setting("_global_script_class_icons")) {
Dictionary d = ProjectSettings::get_singleton()->get("_global_script_class_icons");
List<Variant> keys;
d.get_key_list(&keys);

for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
String name = E->get().operator String();
_script_class_icon_paths[name] = d[name];
for (List<Variant>::Element *E = keys.front(); E; E = E->next()) {
String name = E->get().operator String();
_script_class_icon_paths[name] = d[name];

String path = ScriptServer::get_global_class_path(name);
script_class_set_name(path, name);
String path = ScriptServer::get_global_class_path(name);
script_class_set_name(path, name);
}
}
}

Expand Down

0 comments on commit 911d3a4

Please sign in to comment.