vlcrender: prevent crash on close

magicrub · Mar 10, 2016 · 7ca40d7 · 7ca40d7
1 parent 5fd8250
commit 7ca40d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/MainV2.cs b/MainV2.cs
@@ -1561,6 +1561,16 @@ protected override void OnClosing(CancelEventArgs e)
 
             Warnings.WarningEngine.Stop();
 
+            log.Info("closing vlcrender");
+            try
+            {
+                while (vlcrender.store.Count > 0)
+                    vlcrender.store[0].Stop();
+            }
+            catch
+            {
+            }
+
             log.Info("closing pluginthread");
 
             pluginthreadrun = false;

diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj
@@ -3588,7 +3588,6 @@
     <Content Include="DLLs\NumpyDotNet.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ExtLibs\LibVLC.NET\LibVLC.NET.csproj" />
     <Content Include="LogAnalyzer\DataflashLog.py">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/Utilities/vlcrender.cs b/Utilities/vlcrender.cs
@@ -9,7 +9,7 @@ namespace MissionPlanner.Utilities
 {
     public class vlcrender
     {
-        static List<vlcrender> store = new List<vlcrender>();
+        internal static List<vlcrender> store = new List<vlcrender>();
 
         LibVLCLibrary library;
         IntPtr inst, mp, m;