[Xfce4-commits] [panel-plugins/xfce4-time-out-plugin] 01/01: Do not enable countdown when configuration changes (Bug #16118)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-time-out-plugin.

commit a6b8e157be2c88e9d5576d31c4e5e00eb4d6d7c4
Author: Alexey Ugnichev <alexey.ugnichev at gmail.com>
Date:   Fri Oct 4 15:52:57 2019 +0300

    Do not enable countdown when configuration changes (Bug #16118)
    
    After closing the property dialog, the countdown was resumed or
    reset (if "time between breaks" value changed) even when disabled.
---
 panel-plugin/time-out.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/time-out.c b/panel-plugin/time-out.c
index 388b3e6..9425c6e 100644
--- a/panel-plugin/time-out.c
+++ b/panel-plugin/time-out.c
@@ -703,13 +703,16 @@ time_out_end_configure (GtkDialog     *dialog,
   time_out_save_settings (time_out);
 
   /* Restart or resume break countdown */
-  if (G_UNLIKELY (restart && time_out->enabled))
+  if (time_out->enabled)
     {
-      time_out_stop_break_countdown (time_out);
-      time_out_start_break_countdown (time_out, time_out->break_countdown_seconds);
+      if (G_UNLIKELY (restart))
+        {
+          time_out_stop_break_countdown (time_out);
+          time_out_start_break_countdown (time_out, time_out->break_countdown_seconds);
+        }
+      else
+        time_out_countdown_resume (time_out->break_countdown);
     }
-  else
-    time_out_countdown_resume (time_out->break_countdown);
 
   /* Destroy the properties dialog */
   gtk_widget_destroy (GTK_WIDGET (dialog));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.