Bug fixes

safeeyes/core.py

@@ -140,7 +140,8 @@ class SafeEyesCore:
             break_obj = self.break_queue.get_break(long_break)
             if not break_obj:
                 return False
-            time += datetime.timedelta(minutes=break_obj.time)
+            if not self.break_queue.is_long_break:
+                time += datetime.timedelta(minutes=break_obj.time)
 
         return time
 

safeeyes/model.py

@@ -117,7 +117,7 @@ class BreakQueue:
         if self.__current_break is None:
             self.__current_break = self.next()
         if long_break:
-            return self.__next_long()
+            return self.__long_queue[self.__current_long]
         else:
             return self.__current_break
 

safeeyes/plugins/trayicon/plugin.py

@@ -274,7 +274,10 @@ class TrayIcon:
         """
         show_long = self.plugin_config.get('show_long_break_time', False)
         formatted_time = utility.format_time(self.get_break_time(show_long))
-        message = _('Next break at %s') % (formatted_time)
+        if show_long:
+            message = _('Next long break at %s') % (formatted_time)
+        else:
+            message = _('Next break at %s') % (formatted_time)
 
         # Update the menu item label
         utility.execute_main_thread(self.item_info.set_label, message)