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

Merge pull request #1227 from SPK44/spk44/double_condition_check

Browse Source 
Code Review of #1220
This commit is contained in:
Marcus Meissner
2026-03-17 08:46:07 +01:00
committed by GitHub
parent 07114811b3 bee9fb528c
commit ed34e9e57c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
camlibs/ptp2/library.c
View File

@@ -3286,7 +3286,7 @@ camera_exit (Camera *camera, GPContext *context)
* operation in PTPIP mode. */
if (camera->port->type == GP_PORT_PTPIP) {
if (ptp_operation_issupported(params, 0x9280)
&& ptp_operation_issupported(params, 0x9280)) {
&& ptp_operation_issupported(params, 0x9281)) {
C_PTP (ptp_sony_9280(params, 0x4,0,5,0,0,0,0));
C_PTP (ptp_sony_9281(params, 0x4));
}
@@ -9865,7 +9865,8 @@ camera_init (Camera *camera, GPContext *context)
case PTP_VENDOR_SONY:
/* Some Sony cameras expect this before filesytem reading is available. */
if (camera->port->type == GP_PORT_PTPIP) {
if (ptp_operation_issupported(params, 0x9280)) {
if (ptp_operation_issupported(params, 0x9280)
&& ptp_operation_issupported(params, 0x9281)) {
C_PTP (ptp_sony_9280(params, 0x4,2,2,0,0,1,1));
C_PTP (ptp_sony_9281(params, 0x4));
}