fix

fixstars · Oct 10, 2024 · d1fee9a · d1fee9a
1 parent c77ccdc
commit d1fee9a
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/src/bb/image-io/rt_u3v.h b/src/bb/image-io/rt_u3v.h
@@ -656,30 +656,29 @@ class U3V {
                 if (err_) {
                     log::error(err_->message);
                     err_ = nullptr;
-                    device_vender_name = "";
-                }
-#ifdef _WIN32
-                    order_filp_ = false;
-#else
-                if (strcmp(device_vender_name, "Sony Semiconductor Solutions Corporation") == 0) {
-                    const char *device_model_name;
-                    device_model_name = arv_device_get_string_feature_value(devices_[index_on_opened_device].device_, "DeviceModelName", &err_);
-                    if (err_) {
-                        log::error(err_->message);
-                        err_ = nullptr;
-                    } else {
-                        if (strcmp(device_model_name, "    ") == 0) {
-                            is_param_integer_ = true;
-                            frame_count_method_ = FrameCountMethod::TIMESTAMP;
-                            arv_uv_device_set_usb_mode(devices_[index_on_opened_device].device_, ARV_UV_USB_MODE_SYNC);  // hotfix for v1.0
+                } else {
+                    if (strcmp(device_vender_name, "Sony Semiconductor Solutions Corporation") == 0) {
+                        const char *device_model_name;
+                        device_model_name = arv_device_get_string_feature_value(devices_[index_on_opened_device].device_, "DeviceModelName", &err_);
+                        if (err_) {
+                            log::error(err_->message);
+                            err_ = nullptr;
+                        } else {
+                            if (strcmp(device_model_name, "    ") == 0) {
+                                is_param_integer_ = true;
+                                frame_count_method_ = FrameCountMethod::TIMESTAMP;
+                                arv_uv_device_set_usb_mode(devices_[index_on_opened_device].device_, ARV_UV_USB_MODE_SYNC);  // hotfix for v1.0
+                            }
+                        }
+                        if (is_gendc_) {
+                            frame_count_method_ = FrameCountMethod::TYPESPECIFIC3;
+#ifndef _WIN32
+                            order_filp_ = true;
+#endif
                         }
-                    }
-                    if (is_gendc_) {
-                        frame_count_method_ = FrameCountMethod::TYPESPECIFIC3;
-                        order_filp_ = true;
                     }
                 }
-#endif
+
                 log::info("\tDevice/USB {}::{} : {}", index_on_opened_device, "frame_count method is ",
                           frame_count_method_ == FrameCountMethod::TIMESTAMP     ? "Timestamp" :
                           frame_count_method_ == FrameCountMethod::TYPESPECIFIC3 ? "TypeSpecific" :