From dcde7ccdfadb90f29d178a0b28c4696c9cd1a19e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 8 Dec 2019 12:37:51 +0100 Subject: [PATCH] revert a disabling of EOS M functionality that mistakenly slipped in. Only enable it for EOS M, but not for PowerShot SX --- camlibs/ptp2/config.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index adf70f207..4c95de445 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -455,7 +455,10 @@ camera_prepare_canon_eos_capture(Camera *camera, GPContext *context) { C_PTP (ptp_check_eos_events (params)); params->eos_captureenabled = 1; - if (is_canon_eos_m (params) && 0) { + /* run this only on EOS M, not on PowerShot SX */ + /* FIXME: needs more testing :/ */ + if (is_canon_eos_m (params) && strstr(params->deviceinfo.Model,"EOS")) { + /* This code is needed on EOS m3 at least. might not be needed on others ... mess :/ */ PTPPropertyValue ct_val; GP_LOG_D ("EOS M detected");