Merge pull request #24 from kefniark/feature/upgrade

Fix multi thread issue
kefniark · Feb 22, 2018 · ef417c7 · ef417c7
2 parents 9cfa844 + bc7226b
commit ef417c7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Assets/Scripts/Scanner/Scanner.cs b/Assets/Scripts/Scanner/Scanner.cs
@@ -91,6 +91,11 @@ public void Scan(Action<string, string> callback)
 			#if !UNITY_WEBGL
 			if (Settings.ScannerBackgroundThread)
 			{
+				if (CodeScannerThread != null)
+				{
+					Stop(true);
+				}
+
 				decodeInterrupted = false;
 				CodeScannerThread = new Thread(ThreadDecodeQR);
 				CodeScannerThread.Start();
@@ -124,6 +129,7 @@ private void Stop(bool forced)
 			{
 				decodeInterrupted = true;
 				CodeScannerThread.Join();
+				CodeScannerThread = null;
 			}
 			#endif