Fix for bad file descriptor error when no cameras are connected

karlrees · Jul 7, 2024 · 3694665 · 3694665
1 parent 24f38ac
commit 3694665
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/libpktriggercord/src/pslr.c b/libpktriggercord/src/pslr.c
@@ -377,6 +377,11 @@ pslr_handle_t pslr_init( char *model, char *device ) {
     for ( i=0; i<driveNum; ++i ) {
         pslr_result result = get_drive_info( drives[i], &fd, vendorId, sizeof(vendorId), productId, sizeof(productId));
 
+        // If device error, we shouldn't do anything esle with the file descriptor, so skip to next drive
+        if (result == PSLR_DEVICE_ERROR) {
+            continue;
+        }
+
         DPRINT("\tChecking drive:  %s %s %s\n", drives[i], vendorId, productId);
         if ( find_in_array( valid_vendors, sizeof(valid_vendors)/sizeof(valid_vendors[0]),vendorId) != -1
                 && find_in_array( valid_models, sizeof(valid_models)/sizeof(valid_models[0]), productId) != -1 ) {
@@ -406,7 +411,6 @@ pslr_handle_t pslr_init( char *model, char *device ) {
             }
         } else {
             close_drive( &fd );
-            free(drives);
             continue;
         }
     }