diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | doc/classes/BaseButton.xml | 3 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 12afc7f48d..cb576efee7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,9 +67,10 @@ install: misc/ci/android-tools-linux.sh; fi - if [ "$PLATFORM" = "javascript" ]; then - git clone --depth 1 --branch 1.39.19 https://github.com/emscripten-core/emsdk; + git clone --depth 1 https://github.com/emscripten-core/emsdk; ./emsdk/emsdk install latest; - ./emsdk/emsdk activate --no-embedded latest; + ./emsdk/emsdk activate latest; + source ./emsdk/emsdk_env.sh; fi before_script: diff --git a/doc/classes/BaseButton.xml b/doc/classes/BaseButton.xml index 5e908b0e53..3812b45b13 100644 --- a/doc/classes/BaseButton.xml +++ b/doc/classes/BaseButton.xml @@ -13,7 +13,7 @@ <return type="void"> </return> <description> - Called when the button is pressed. + Called when the button is pressed. If you need to know the button's pressed state (and [member toggle_mode] is active), use [method _toggled] instead. </description> </method> <method name="_toggled" qualifiers="virtual"> @@ -89,6 +89,7 @@ <signal name="pressed"> <description> Emitted when the button is toggled or pressed. This is on [signal button_down] if [member action_mode] is [constant ACTION_MODE_BUTTON_PRESS] and on [signal button_up] otherwise. + If you need to know the button's pressed state (and [member toggle_mode] is active), use [signal toggled] instead. </description> </signal> <signal name="toggled"> diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 4f783f4e27..71830d0464 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -701,7 +701,7 @@ void ScriptEditor::_close_tab(int p_idx, bool p_save, bool p_history_back) { Ref<Script> script = current->get_edited_resource(); if (p_save) { // Do not try to save internal scripts - if (!(script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1)) { + if (!script.is_valid() || !(script->get_path() == "" || script->get_path().find("local://") != -1 || script->get_path().find("::") != -1)) { _menu_option(FILE_SAVE); } } |