backport pulse fix.

SVN revision: 84250

diff --git a/ChangeLog b/ChangeLog
index a55d754414abb1f5937ed73e04844c16f38bc8c1..a501a70c5428d92946e3afb2a0270bb70f762d3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -756,4 +756,5 @@
 2013-02-20 Carsten Haitzler (The Rasterman)
 
         * Fix gl engine vsync option pass-in in elm_win
-        
+        * Fix elm_progressbar_pulse() to abort if pulsing not enabled
+

diff --git a/NEWS b/NEWS
index 37ee6d8458145f66bbb7abfed2da43aef3bc7a1a..56a487c6fb9ef42d3d186ee47f92666aac7905d7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,8 @@ Fixes:
    * ignore tab key widget focus change if control/alt is pressed
    * prevent blank entry hoversels
    * Fix vsync option in gl engine windows
-   
+   * Fix elm_progressbar_pulse() to abort if pulsing not enabled
+        
 Elementary 1.7.5
 
 Changes since Elementary 1.7.5:

diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 9bb01bff8deb5d537bf81dd91acc74a266b6bb0b..17b004a9bb774e999de23316f1805ad97b09f173 100644 (file)
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -362,7 +362,7 @@ elm_progressbar_pulse(Evas_Object *obj,
    ELM_PROGRESSBAR_DATA_GET(obj, sd);
 
    state = !!state;
-   if ((!sd->pulse) && (sd->pulse_state == state)) return;
+   if ((!sd->pulse) || (sd->pulse_state == state)) return;
 
    sd->pulse_state = state;