Fix autosave when run on remote device

Fix #5367
This commit is contained in:
volzhs 2016-06-24 21:20:43 +09:00
parent 9e0b6057e7
commit 3dd4cf3fed
2 changed files with 11 additions and 8 deletions

View file

@ -2639,11 +2639,16 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
} break; } break;
case RUN_PLAY_NATIVE: { case RUN_PLAY_NATIVE: {
_menu_option_confirm(RUN_STOP,true);
emit_signal("play_pressed"); bool autosave = EDITOR_DEF("run/auto_save_before_running",true);
editor_run.run_native_notify(); if (autosave) {
_menu_option_confirm(FILE_SAVE_SCENE, false);
}
if (run_native->is_deploy_debug_remote_enabled()){
_menu_option_confirm(RUN_STOP,true);
emit_signal("play_pressed");
editor_run.run_native_notify();
}
} break; } break;
case RUN_SCENE_SETTINGS: { case RUN_SCENE_SETTINGS: {

View file

@ -101,10 +101,8 @@ void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform); Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
ERR_FAIL_COND(eep.is_null()); ERR_FAIL_COND(eep.is_null());
if (deploy_debug_remote) { emit_signal("native_run");
emit_signal("native_run");
}
int flags=0; int flags=0;
if (deploy_debug_remote) if (deploy_debug_remote)
flags|=EditorExportPlatform::EXPORT_REMOTE_DEBUG; flags|=EditorExportPlatform::EXPORT_REMOTE_DEBUG;