Merge branch 'master' into develop

Conflicts: MATLAB/+XPlaneConnect/XPlaneConnect.jar MATLAB/Example/Example.m
2015-08-17 09:24:45 -07:00
parent b6be2510c5 601bae9024
commit c226e170a7
4 changed files with 23 additions and 15 deletions
--- a/Java/src/XPlaneConnect.java
+++ b/Java/src/XPlaneConnect.java
@@ -510,7 +510,14 @@ public class XPlaneConnect implements AutoCloseable
        {
            if(i == 4)
            {
-                bb.put(cur, (byte) values[i]);
+                if(i >= values.length)
+                {
+                    bb.put(cur, (byte)-1);
+                }
+                else
+                {
+                    bb.put(cur, (byte)values[i]);
+                }
                cur += 1;
            }
            else if (i >= values.length)