diff options
| author | hondres <liu.gam3@gmail.com> | 2016-01-20 08:59:14 +0100 |
|---|---|---|
| committer | hondres <liu.gam3@gmail.com> | 2016-01-20 08:59:14 +0100 |
| commit | c4578453fad8c6d9d440d96c60167183fe82031a (patch) | |
| tree | b4d3c7046e53f1c1e8c8ccca0d5f1acdb1af3c6f /platform | |
| parent | 696643ce1827f028864de94f1fc6b340d43dbb0e (diff) | |
fix string conversion in javascript export
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/export/export.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 2a92c02d3d..e055aeea56 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -185,7 +185,7 @@ void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t>& p_html, const St current_line = current_line.replace("$GODOT_JS",p_name+".js"); current_line = current_line.replace("$GODOT_CANVAS_WIDTH",Globals::get_singleton()->get("display/width")); current_line = current_line.replace("$GODOT_CANVAS_HEIGHT",Globals::get_singleton()->get("display/height")); - current_line = current_line.replace("$GODOT_HEAD_TITLE",!html_title.empty()?html_title:Globals::get_singleton()->get("application/name")); + current_line = current_line.replace("$GODOT_HEAD_TITLE",!html_title.empty()?html_title:(String) Globals::get_singleton()->get("application/name")); current_line = current_line.replace("$GODOT_HEAD_INCLUDE",html_head_include); current_line = current_line.replace("$GODOT_STYLE_FONT_FAMILY",html_font_family); current_line = current_line.replace("$GODOT_STYLE_INCLUDE",html_style_include); |