Bug fix for issue #40

slgobinath · Jan 11, 2017 · f2403c7 · f2403c7
1 parent 617963c
commit f2403c7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/safeeyes/debian/changelog b/safeeyes/debian/changelog
@@ -1,4 +1,6 @@
-safeeyes (1.1.1-1) xenial; urgency=medium
+safeeyes (1.1.2-1) xenial; urgency=medium
+
+  * Bug fix for no breaks after 1st one
 
   * Add about dialog and language selection to Settings dialog
 

diff --git a/safeeyes/safeeyes/SafeEyesCore.py b/safeeyes/safeeyes/SafeEyesCore.py
@@ -142,7 +142,9 @@ def notify_and_start_break(self):
 
 			# Resume
 			if self.active:
-				self.start()
+				# Schedule the break again
+				thread = threading.Thread(target=self.scheduler_job)
+				thread.start()
 
 			self.skipped = False
 
@@ -152,19 +154,11 @@ def notify_and_start_break(self):
 	def is_long_break(self):
 		return self.break_count == self.no_of_short_breaks_per_long_break - 1
 
-	# User skipped the break using Skip button
-	def skip_break(self):
-		self.skipped = True
-
 	"""
-		Reschedule the job
+		User skipped the break using Skip button
 	"""
-	def toggle_active_state(self):
-		if self.active:
-			self.stop()
-
-		else:
-			self.start()
+	def skip_break(self):
+		self.skipped = True
 
 	"""
 		Stop Safe Eyes

diff --git a/safeeyes/safeeyes/safeeyes b/safeeyes/safeeyes/safeeyes
@@ -53,7 +53,7 @@ system_language_directory = os.path.join(bin_directory, "config/lang")
 
 is_active = True
 CONFIGURATION_VERSION = 1
-SAFE_EYES_VERSION = "1.1.1"
+SAFE_EYES_VERSION = "1.1.2"
 
 """
 	Listen to tray icon Settings action and send the signal to Settings dialog.