fix: fix camera ignoring reloading

futrime · futrime · commit 03c2669940f4 · 2023-04-08T20:43:50.000+08:00
diff --git a/Source/MainWindow.cs b/Source/MainWindow.cs
@@ -93,6 +93,8 @@ private static readonly (Mat Departure, Mat Destination) IconOrder = (
     /// </summary>
     private const int SerialPortBufferLength = 1048576;
 
+    public int _lastCameraIndex = 0;
+
     #endregion
 
 
diff --git a/Source/SettingsWindow.cs b/Source/SettingsWindow.cs
@@ -39,7 +39,6 @@ public partial class SettingsWindow : Form
     private ConfigType _config;
     private string _configFilePath = SettingsWindow.DefaultConfigFilePath;
     private MainWindow _mainWindow;
-    private int _lastCameraIndex = 0;
 
     #endregion
 
@@ -74,7 +73,7 @@ private void ApplyConfig()
         var camera = this._mainWindow.Camera;
         this._mainWindow.Camera = null;
 
-        if (this._mainWindow.Config.Camera != this._lastCameraIndex)
+        if (this._mainWindow.Config.Camera != this._mainWindow._lastCameraIndex)
         {
             // Release the camera (if it is opened) and open the new camera.
             camera?.Release();
@@ -91,7 +90,7 @@ private void ApplyConfig()
                 );
             }
 
-            this._lastCameraIndex = this._mainWindow.Config.Camera;
+            this._mainWindow._lastCameraIndex = this._mainWindow.Config.Camera;
         }
 
         this._mainWindow.CameraFrameSize = new OpenCvSharp.Size(

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public partial class SettingsWindow : Form`
`39`	`39`	`private ConfigType _config;`
`40`	`40`	`private string _configFilePath = SettingsWindow.DefaultConfigFilePath;`
`41`	`41`	`private MainWindow _mainWindow;`
`42`		`- private int _lastCameraIndex = 0;`
`43`	`42`
`44`	`43`	`#endregion`
`45`	`44`
`@@ -74,7 +73,7 @@ private void ApplyConfig()`
`74`	`73`	`var camera = this._mainWindow.Camera;`
`75`	`74`	`this._mainWindow.Camera = null;`
`76`	`75`
`77`		`- if (this._mainWindow.Config.Camera != this._lastCameraIndex)`
	`76`	`+ if (this._mainWindow.Config.Camera != this._mainWindow._lastCameraIndex)`
`78`	`77`	`{`
`79`	`78`	`// Release the camera (if it is opened) and open the new camera.`
`80`	`79`	`camera?.Release();`
`@@ -91,7 +90,7 @@ private void ApplyConfig()`
`91`	`90`	`);`
`92`	`91`	`}`
`93`	`92`
`94`		`- this._lastCameraIndex = this._mainWindow.Config.Camera;`
	`93`	`+ this._mainWindow._lastCameraIndex = this._mainWindow.Config.Camera;`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`this._mainWindow.CameraFrameSize = new OpenCvSharp.Size(`