Merge branch 'dev'

Ignore pycache and temp files
Merge branch 'dev'
2021-06-23 05:47:39 -07:00 · 2021-06-23 05:47:29 -07:00 · 2020-08-02 07:12:46 -07:00 · 2020-08-02 07:12:36 -07:00 · 2020-08-02 04:33:25 -07:00 · 2020-08-02 03:13:19 -07:00
2 changed files with 9 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,7 @@
+
+
+**/__pycache__/
+
+*~
+
+
--- a/TextCanvas.py
+++ b/TextCanvas.py
@ -105,7 +105,8 @@ class TextCanvas:
 		# So far simply does maintenance once per second
 		while self.__conveyor_enabled is True:
 			
-			self.__fps_samples.append(0)
+			with RAIILock(self.__lock):
+				self.__fps_samples.append(0)
 			
 			time.sleep(1)
Author	SHA1	Message	Date
Mike	0b1d287c57	Merge branch 'dev'	2021-06-23 05:47:39 -07:00
Mike	1b2324a080	Ignore pycache and temp files	2021-06-23 05:47:29 -07:00
Mike	5fb50bf206	Merge branch 'dev'	2020-08-02 07:12:46 -07:00
Mike	80253ebcb2	Throw an RAII lock around the conveyor to avoid a race condition	2020-08-02 07:12:36 -07:00
Mike	b84fd76f1d	Merge branch 'dev'	2020-08-02 04:33:25 -07:00
Mike	6349e11f9d	Merge branch 'dev'	2020-08-02 03:13:19 -07:00
Mike	3fbb6c03f0	Merge branch 'dev'	2020-08-02 01:38:39 -07:00