Fix interactive script running flag always being set to true. Update unit test.

Author: tomcashman

CHANGES

@@ -1,3 +1,6 @@
+[1.7.1]
+- Fix interactive script running flag always being set to true. Update unit test.
+
 [1.7.0]
 - Prevent game future execution by checking for script skipping in constructor
 - Allow scripts to be marked as player interactive to restrict one interactive script running at a time

core/src/main/java/org/mini2Dx/miniscript/core/util/ScriptInvocationQueue.java

@@ -47,7 +47,9 @@ private ScriptInvocation pollInteractiveScript() {
 		interactiveScriptLock.lockWrite();
 		if(!interactiveScriptRunning.get()) {
 			result = interactiveScriptQueue.poll();
-			interactiveScriptRunning.set(true);
+			if(result != null) {
+				interactiveScriptRunning.set(true);
+			}
 		}
 		interactiveScriptLock.unlockWrite();
 		return result;
@@ -82,4 +84,8 @@ public void clearInteractiveScriptStatus() {
 		interactiveScriptRunning.set(false);
 		interactiveScriptLock.unlockWrite();
 	}
+
+	public boolean isInteractiveScriptRunnung() {
+		return interactiveScriptRunning.get();
+	}
 }

core/src/test/java/org/mini2Dx/miniscript/core/util/ScriptInvocationQueueTest.java

@@ -25,7 +25,6 @@ public void testOnlyOneInteractiveScriptPolled() {
 			invocationQueue.offer(createInvocation(i % 10 == 0 ? INTERACTIVE_SCRIPT_ID : i, i % 10 == 0));
 		}
 
-
 		final CountDownLatch countDownLatch = new CountDownLatch(threads.length);
 
 		for(int i = 0; i < threads.length; i++) {
@@ -57,6 +56,12 @@ public void testOnlyOneInteractiveScriptPolled() {
 		while(!invocationQueue.isEmpty()) {
 			Assert.assertTrue(interactiveScriptsRunning.get() <= 1);
 		}
+		for(int i = 0; i < threads.length; i++) {
+			try {
+				threads[i].join();
+			} catch (InterruptedException e) {}
+		}
+		Assert.assertFalse(invocationQueue.isInteractiveScriptRunnung());
 	}
 
 	private ScriptInvocation createInvocation(int scriptId, boolean interactive) {