diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2019-12-08 12:37:51 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2019-12-08 12:37:51 +0100 |
| commit | dcde7ccdfadb90f29d178a0b28c4696c9cd1a19e (patch) | |
| tree | d54639d9052134370346871050bca365a2e9c133 | |
| parent | 708b0f3bbf9030b9da4ece9b8c22f378c87bbef8 (diff) | |
| download | libgphoto2-dcde7ccdfadb90f29d178a0b28c4696c9cd1a19e.tar.gz | |
revert a disabling of EOS M functionality that mistakenly slipped in.
Only enable it for EOS M, but not for PowerShot SX
| -rw-r--r-- | camlibs/ptp2/config.c | 5 |
1 files changed, 4 insertions, 1 deletions
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"); |