From 8c5cba338c5cc05c5eede1ed6b8df75797b54e49 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Thu, 23 Nov 2023 10:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=81=E5=AE=9A=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgdriver/hgdev/hg_scanner.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/hgdriver/hgdev/hg_scanner.cpp b/hgdriver/hgdev/hg_scanner.cpp
index adaff0e..4b340ee 100644
--- a/hgdriver/hgdev/hg_scanner.cpp
+++ b/hgdriver/hgdev/hg_scanner.cpp
@@ -344,15 +344,18 @@ 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_)
+		if (run_ && is_firstopen_ && firmware_sup_devs_lock_)
 		{
-				std::this_thread::sleep_for(std::chrono::milliseconds(500));
+			std::this_thread::sleep_for(std::chrono::milliseconds(500));
+			if (run_)
+			{
+				hg_version_init_handle();
 				ret = set_server_blacklist_lock();
+				hg_version_free_handle();
+			}
 		}
 #endif	
-		hg_version_free_handle();
 		is_firstopen_ = false;
 		break;
 	}
@@ -3865,7 +3868,11 @@ int hg_scanner::close(bool force)
 		wait_img_.notify();
 
 		if (thread_devslock_handle_.get())
+		{
 			wait_devsislock_.notify();
+			if (thread_devslock_handle_->joinable())
+				thread_devslock_handle_->join();
+		}
 		//wait_read_int.notify();
 		if(!scan_life_)
 		{