hermet pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=772ffe222914f043f5a1a8ff9c183bc43d3f5b38

commit 772ffe222914f043f5a1a8ff9c183bc43d3f5b38
Author: ChunEon Park <her...@hermet.pe.kr>
Date:   Mon Jun 22 22:50:22 2015 +0900

    live_edit: fix regression bug that introduced in 
14a0e2cfd2f41dad50e823c9f309e088d662ceac
    
    toggling context is corrupted but recovered again.
---
 src/bin/live_edit.c | 7 ++++---
 src/bin/tools.c     | 5 ++---
 src/include/tools.h | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 60aa284..08246ba 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -912,7 +912,6 @@ live_edit_toggle(void)
 {
    live_data *ld = g_ld;
    Eina_Bool on = !ld->on;
-   ld->on = on;
 
    if (on)
      {
@@ -920,10 +919,12 @@ live_edit_toggle(void)
         ld->live_view = enventor_object_live_view_get(ld->enventor);
         ld->ctxpopup = ctxpopup_create(ld);
         stats_info_msg_update("Select a part to add in Live View.");
-        tools_live_update(ld->enventor, EINA_FALSE);
+        tools_live_update(EINA_TRUE);
      }
    else
      live_edit_cancel();
+
+   ld->on = on;
 }
 
 Eina_Bool
@@ -979,7 +980,7 @@ live_edit_cancel(void)
 
    ld->on = EINA_FALSE;
 
-   tools_live_update(ld->enventor, EINA_FALSE);
+   tools_live_update(EINA_FALSE);
 }
 
 void
diff --git a/src/bin/tools.c b/src/bin/tools.c
index dc6856f..56d7729 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -399,13 +399,12 @@ tools_search_update(Evas_Object *enventor EINA_UNUSED,
 }
 
 void
-tools_live_update(Evas_Object *enventor EINA_UNUSED,
-                  Eina_Bool toggle EINA_UNUSED)
+tools_live_update(Eina_Bool on)
 {
    tools_data *td = g_td;
    if (!td) return;
 
-   if (live_edit_get())
+   if (on)
      elm_object_signal_emit(td->live_btn, "icon,highlight,enabled", "");
    else
      elm_object_signal_emit(td->live_btn, "icon,highlight,disabled", "");
diff --git a/src/include/tools.h b/src/include/tools.h
index 0b4e4f6..b1be3f9 100644
--- a/src/include/tools.h
+++ b/src/include/tools.h
@@ -7,6 +7,6 @@ void tools_swallow_update(Evas_Object *enventor, Eina_Bool 
toggle);
 void tools_status_update(Evas_Object *enventor, Eina_Bool toggle);
 void tools_goto_update(Evas_Object *enventor, Eina_Bool toggle);
 void tools_search_update(Evas_Object *enventor, Eina_Bool toggle);
-void tools_live_update(Evas_Object *enventor, Eina_Bool toggle);
+void tools_live_update(Eina_Bool on);
 void tools_console_update(Eina_Bool on);
 void tools_menu_update(Eina_Bool on);

-- 


Reply via email to