keep canon eos remotemode=1 on exit, to keep the display on

msmeissn · msmeissn · commit 07a2176e11f5 · 2022-01-03T10:30:12.000+01:00
gphoto/gphoto2#465
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
@@ -582,7 +582,8 @@ camera_unprepare_canon_eos_capture(Camera *camera, GPContext *context) {
 
 	/* Drain the rest set of the event data */
 	C_PTP (ptp_check_eos_events (params));
-	C_PTP (ptp_canon_eos_setremotemode(params, 0));
+	/* remotemode 1 should stay, as it keeps the display on for some reason */
+	/*C_PTP (ptp_canon_eos_setremotemode(params, 0));*/
 	C_PTP (ptp_canon_eos_seteventmode(params, 0));
 	params->eos_captureenabled = 0;
 	return GP_OK;
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
@@ -3100,6 +3100,8 @@ camera_exit (Camera *camera, GPContext *context)
 				if ((exit_gp_result = camera_unprepare_capture (camera, context)) < GP_OK)	/* note: gets gphoto resultcodes, not ptp retcodes */
 					goto exitfailed;
 			}
+			/* this switches the display back on ... */
+			C_PTP (ptp_canon_eos_setremotemode(params, 1));
 			break;
 		case PTP_VENDOR_NIKON:
 			if (ptp_operation_issupported(params, PTP_OC_NIKON_EndLiveView))

Original file line number	Diff line number	Diff line change
`@@ -3100,6 +3100,8 @@ camera_exit (Camera camera, GPContext context)`
`3100`	`3100`	`if ((exit_gp_result = camera_unprepare_capture (camera, context)) < GP_OK) /* note: gets gphoto resultcodes, not ptp retcodes */`
`3101`	`3101`	`goto exitfailed;`
`3102`	`3102`	`}`
	`3103`	`+ /* this switches the display back on ... */`
	`3104`	`+ C_PTP (ptp_canon_eos_setremotemode(params, 1));`
`3103`	`3105`	`break;`
`3104`	`3106`	`case PTP_VENDOR_NIKON:`
`3105`	`3107`	`if (ptp_operation_issupported(params, PTP_OC_NIKON_EndLiveView))`