summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2020-05-10 18:10:58 +0200
committerMarcus Meissner <marcus@jet.franken.de>2020-05-10 18:10:58 +0200
commit2f727b20463c3f396a672a67db3faca998fa1a4b (patch)
tree973a28d3a3c0028cdd6886e8cf84adcabc22aad8
parent7a5fe3341b2b1aa8acfc507194d59bca411c532b (diff)
downloadlibgphoto2-2f727b20463c3f396a672a67db3faca998fa1a4b.tar.gz
reenable the weird EOS M code that is needed for making liveview work again.
I forgot for which camera it needs to be disabled. https://github.com/gphoto/libgphoto2/issues/499
-rw-r--r--camlibs/ptp2/config.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
index cf9334bae..bf9c6fc1e 100644
--- a/camlibs/ptp2/config.c
+++ b/camlibs/ptp2/config.c
@@ -456,8 +456,13 @@ camera_prepare_canon_eos_capture(Camera *camera, GPContext *context) {
params->eos_captureenabled = 1;
/* 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")) {
+ /* I lost track where it is needed.
+ * Need it:
+ * + EOS M10
+ * + PowerShot SX 720HS
+ * + PowerShot G9x mark II
+ */
+ if (is_canon_eos_m (params)) {
/* This code is needed on EOS m3 at least. might not be needed on others ... mess :/ */
PTPPropertyValue ct_val;