possibly fix

Author: RoderickQiu

floating.html

@@ -180,13 +180,6 @@
                 $('#floating-bottom-bar').css("background-color", newOnlyRestColor + "19");
             }
 
-            ipc.removeAllListeners('floating-stop-sync');
-            ipc.on("floating-stop-sync", function (event, message) {
-                isWorking = message;
-                if (isWorking) $("#stopper").html("<i class='iconfont icon-pause' aria-hidden='true'></i>");
-                else $("#stopper").html("<i class='iconfont icon-play' aria-hidden='true'></i>");
-            });
-
             if (method !== 3) {
                 if (store.get('disable-pausing') === true) {
                     if (!((store.get('disable-pausing-special') === "work" && method !== 1) ||
@@ -209,6 +202,12 @@
             }
         });
 
+        ipc.on("floating-stop-sync", function (event, message) {
+            isWorking = message;
+            if (isWorking) $("#stopper").html("<i class='iconfont icon-pause' aria-hidden='true'></i>");
+            else $("#stopper").html("<i class='iconfont icon-play' aria-hidden='true'></i>");
+        });
+
         if (process.platform === "darwin") {
             $("#floating-recover").css("display", "none");
             $("#floating-close").css("display", "none");

timer.html

@@ -867,7 +867,7 @@ <h3>
                 }
                 if ((method === 1 && workTime > 60000) || (method === 2 && restTime > 60000)) moreThanOneMin = 1;
                 else moreThanOneMin = 0;//if less than 1 min, prevent less than 1min warning
-                lastRecordedMinutesLeft = -1, lastRecordedHoursLeft = -1, lastRecordedProgress = 0.00;
+                lastRecordedMinutesLeft = -1, lastRecordedHoursLeft = -1, lastRecordedProgress = 0.00, lastRecordedSecond = -1;
                 canStop = false;
                 timingData.set("last-recorded-minutes-left", -1);
                 timingData.set("last-recorded-hours-left", -1);
@@ -1351,14 +1351,36 @@ <h3>
                     minutes = Math.floor((seconds - hours * 3600) / 60);
                     remainMinutes = hours * 60 + minutes;
 
+                    if (progress !== lastRecordedProgress) {
+                        lastRecordedProgress = progress;
+                        naturalProgress = Math.round(lastRecordedProgress * 100);
+                        $bottomBar.css("width", naturalProgress + "%");
+                        ipc.send("progress-bar-set", {
+                            progress: progress,
+                            remain: minutes + hours * 60,
+                            positive: false
+                        });
+                        if (hasFloating && !(hours === 0 && minutes === 0)) {
+                            ipc.send("floating-conversation", {
+                                topic: "time-left",
+                                val: seconds / 60,
+                                percentage: naturalProgress,
+                                method: method,
+                                isWorking: isClockWorking,
+                                isOnlyRest: isOnlyRest
+                            });
+                        }
+                    }
+
                     if (hours === 0 && minutes === 0 && (lastRecordedSecond !== seconds)) {
                         lastRecordedSecond = seconds;
                         if (hasFloating) ipc.send("floating-conversation", {
                             topic: "time-left",
                             val: seconds / 60,
                             percentage: naturalProgress,
                             method: method,
-                            isWorking: isClockWorking
+                            isWorking: isClockWorking,
+                            isOnlyRest: isOnlyRest
                         });
                     }
 
@@ -1376,25 +1398,6 @@ <h3>
                         });
                     }
 
-                    if (progress !== lastRecordedProgress) {
-                        lastRecordedProgress = progress;
-                        naturalProgress = Math.round(lastRecordedProgress * 100);
-                        ipc.send("progress-bar-set", {
-                            progress: progress,
-                            remain: minutes + hours * 60,
-                            positive: false
-                        });
-                        if (hasFloating) ipc.send("floating-conversation", {
-                            topic: "time-left",
-                            val: seconds / 60,
-                            percentage: naturalProgress,
-                            method: method,
-                            isWorking: isClockWorking,
-                            isOnlyRest: isOnlyRest
-                        });
-                        $bottomBar.css("width", naturalProgress + "%");
-                    }
-
                     seconds -= hours * 3600 + minutes * 60;
                     $nowTiming.text(hours + h + minutes + min + seconds + s);