From 6b53aed32e6ee2ddda451c01d45129250a0f91fe Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Thu, 23 Nov 2023 10:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=AE=BE=E5=A4=87=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hgdriver/hgdev/hg_scanner.cpp | 4 ++-- hgdriver/hgdev/hg_scanner_239.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp index 65a5b2f..adaff0e 100644 --- a/hgdriver/hgdev/hg_scanner.cpp +++ b/hgdriver/hgdev/hg_scanner.cpp @@ -258,7 +258,6 @@ hg_scanner::~hg_scanner() if (thread_devslock_handle_.get() && thread_devslock_handle_->joinable()) thread_devslock_handle_->join(); #endif - hg_version_free_handle(); delete custom_gamma_val_; if(ImagePrc_pHandle_) hg_imgproc::release(ImagePrc_pHandle_); @@ -345,14 +344,15 @@ void hg_scanner::thread_devslock_handle(void) while (run_) { wait_devsislock_.wait(); + hg_version_init_handle(); #ifdef OEM_HUAGAO if (is_firstopen_ && firmware_sup_devs_lock_) { std::this_thread::sleep_for(std::chrono::milliseconds(500)); ret = set_server_blacklist_lock(); - hg_version_free_handle(); } #endif + hg_version_free_handle(); is_firstopen_ = false; break; } diff --git a/hgdriver/hgdev/hg_scanner_239.cpp b/hgdriver/hgdev/hg_scanner_239.cpp index 6a7ab59..e96a985 100644 --- a/hgdriver/hgdev/hg_scanner_239.cpp +++ b/hgdriver/hgdev/hg_scanner_239.cpp @@ -177,7 +177,7 @@ hg_scanner_239::hg_scanner_239(const char* dev_name, int pid,usb_io* io) : hg_sc else init_settings((jsontext5 + jsontext6 + jsontext7).c_str()); } - hg_version_init_handle(); + string str; get_devs_time(str); #ifdef OEM_HUAGAO