1

TSA-V/frmBoard/FrmAddBoard.cs

@@ -402,6 +402,7 @@ namespace TSA_V
             //openFileDialogImg.DefaultExt = "jpg|gif|bmp|png|jpeg";
             //openFileDialogImg.DefaultExt = "jpg|gif|bmp|png|jpeg";
             //openFileDialogImg.Filter = "jpg|*.jpg|gif|*.gif|bmp|*.bmp|png|*.png|jpeg|*.jpeg";
             //openFileDialogImg.Filter = "jpg|*.jpg|gif|*.gif|bmp|*.bmp|png|*.png|jpeg|*.jpeg";
             openFileDialogImg.Filter = "Image Files|*.bmp;*.jpg;*.gif;*.png;*jpeg|gerber Files|*.*";
             openFileDialogImg.Filter = "Image Files|*.bmp;*.jpg;*.gif;*.png;*jpeg|gerber Files|*.*";
+            openFileDialogImg.Multiselect = true;
             string directory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);//桌面路径
             string directory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);//桌面路径
             openFileDialogImg.InitialDirectory = directory;
             openFileDialogImg.InitialDirectory = directory;
             if (openFileDialogImg.ShowDialog() == DialogResult.OK)
             if (openFileDialogImg.ShowDialog() == DialogResult.OK)

TSA-V/workForm/FrmTSAV.cs

@@ -1176,11 +1176,11 @@ namespace TSA_V
         private   void VideoThreadRun()
         private   void VideoThreadRun()
         {
         {
             mstart = true;
             mstart = true;
-            while (mstart)
+            while (mstart&& picHandsVideo.Visible)
             {
             {
                 try
                 try
                 {
                 {
-                    if (!HVideoManager.lastInfo.ImgStr.Equals(lastMsg))
+                    if (HVideoManager.lastInfo!=null&&!HVideoManager.lastInfo.ImgStr.Equals(lastMsg))
                     {
                     {
                         Bitmap bitmap = HVideoManager.GetLastImg();
                         Bitmap bitmap = HVideoManager.GetLastImg();
                         if (bitmap != null)
                         if (bitmap != null)