修复锁定功能崩溃问题
This commit is contained in:
parent
6b53aed32e
commit
8c5cba338c
|
@ -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_)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue