properly handle cameras without PTZ function

kerberos-io · Jan 3, 2024 · 9c97422 · 9c97422
1 parent deb0a3f
commit 9c97422
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/machinery/src/onvif/main.go b/machinery/src/onvif/main.go
@@ -311,13 +311,18 @@ func GetPositionFromDevice(configuration models.Configuration) (xsdonvif.PTZVect
 		if err == nil {
 			// Get the PTZ configurations from the device
 			position, err := GetPosition(device, token)
-			if err == nil && position.PanTilt != nil && position.Zoom != nil {
-				// float to string
-				x := strconv.FormatFloat(position.PanTilt.X, 'f', 6, 64)
-				y := strconv.FormatFloat(position.PanTilt.Y, 'f', 6, 64)
-				z := strconv.FormatFloat(position.Zoom.X, 'f', 6, 64)
-				log.Log.Info("onvif.GetPositionFromDevice(): successfully got position (" + x + ", " + y + ", " + z + ")")
-				return position, err
+			if err == nil {
+				if position.PanTilt != nil && position.Zoom != nil {
+					// float to string
+					x := strconv.FormatFloat(position.PanTilt.X, 'f', 6, 64)
+					y := strconv.FormatFloat(position.PanTilt.Y, 'f', 6, 64)
+					z := strconv.FormatFloat(position.Zoom.X, 'f', 6, 64)
+					log.Log.Info("onvif.GetPositionFromDevice(): successfully got position (" + x + ", " + y + ", " + z + ")")
+					return position, err
+				} else {
+					log.Log.Debug("onvif.GetPositionFromDevice(): position is nil")
+					return position, errors.New("position is nil")
+				}
 			} else {
 				log.Log.Debug("onvif.GetPositionFromDevice(): " + err.Error())
 				return position, err