hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=b2495c9a8d4759793483dc09afec81c7a2219a04
commit b2495c9a8d4759793483dc09afec81c7a2219a04 Author: ChunEon Park <her...@hermet.pe.kr> Date: Fri Aug 15 20:08:01 2014 +0900 live_edit: cancel live_edit if edc is reload. --- src/bin/edc_editor.c | 1 + src/bin/live_edit.c | 7 +++++++ src/include/live_edit.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/bin/edc_editor.c b/src/bin/edc_editor.c index 9338609..2cd4c19 100644 --- a/src/bin/edc_editor.c +++ b/src/bin/edc_editor.c @@ -1103,6 +1103,7 @@ edit_part_highlight_toggle(edit_data *ed, Eina_Bool msg) void edit_edc_reload(edit_data *ed, const char *edc_path) { + live_edit_cancel(); config_edc_path_set(edc_path); edit_new(ed); edj_mgr_reload_need_set(EINA_TRUE); diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index cdfd40e..ebf237f 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -327,6 +327,13 @@ live_edit_toggle(void) } void +live_edit_cancel(void) +{ + if (!config_live_edit_get()) return; + live_edit_toggle(); +} + +void live_edit_init(edit_data *ed) { live_data *ld = calloc(1, sizeof(live_data)); diff --git a/src/include/live_edit.h b/src/include/live_edit.h index 1a09be0..4653cf2 100644 --- a/src/include/live_edit.h +++ b/src/include/live_edit.h @@ -1,3 +1,4 @@ void live_edit_init(edit_data *ed); void live_edit_term(void); void live_edit_toggle(void); +void live_edit_cancel(void); --