diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-20 10:08:13 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-20 10:08:13 +0100 |
| commit | 55ab7d1d1ca188c5bbe30e1c45bdd3f405486cd2 (patch) | |
| tree | e9071135be8d51b2762542916cab6aa2fe30fd22 /platform/javascript/export/export.cpp | |
| parent | f2a397375ee46be5725e2e535d3f11a99530f937 (diff) | |
| parent | c4578453fad8c6d9d440d96c60167183fe82031a (diff) | |
| download | redot-engine-55ab7d1d1ca188c5bbe30e1c45bdd3f405486cd2.tar.gz | |
Merge pull request #3392 from Hinsbart/html5-gamepad
fix string conversion in javascript export
Diffstat (limited to 'platform/javascript/export/export.cpp')
| -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); |