darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wait_for_event always used 65 seconds timeout for Olympus ... not the passed in timeout.

Browse Source 
fixes https://github.com/gphoto/gphoto2/issues/305
also helps https://github.com/gphoto/gphoto2/issues/310
This commit is contained in:
Marcus Meissner
2020-05-24 18:01:24 +02:00
parent d43a157bdb
commit dc40e20d66
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/ptp2/library.c
View File

@@ -6197,11 +6197,13 @@ sonyout:
sprintf (*eventdata, "PTP Property %04x changed to 0x%08x", event.Param1, event.Param2);
return GP_OK;
default:
GP_LOG_D ("unexpected unhandled event Code %04x, Param 1 %08x", event.Code, event.Param1);
break;
*eventtype = GP_EVENT_UNKNOWN;
C_MEM (*eventdata = malloc(strlen("PTP Event 0123, Param1 01234567")+1));
sprintf (*eventdata, "PTP Event %04x, Param1 %08x", event.Code, event.Param1);
return GP_OK;
}
}
} while (waiting_for_timeout (&back_off_wait, event_start, 65000)); /* wait for 65 seconds after busy is no longer signaled */
} while (waiting_for_timeout (&back_off_wait, event_start, timeout));
downloadomdfile:
C_MEM (path = malloc(sizeof(CameraFilePath)));