lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加对设置界面或进度指示器父窗口有效性的检查

This commit is contained in:
gb 2023-12-11 15:18:42 +08:00
parent 0eaf2a42f4
commit b071d7d4b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sane/scanner.cpp
View File

@ -3494,7 +3494,7 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo
events_.clear(); events_.clear();
ui_notify = std::function<void(int, void*, int)>(); ui_notify = std::function<void(int, void*, int)>();
if (!IsWindowVisible(parent)) if (!IsWindow(parent) || !IsWindowVisible(parent))
parent = NULL; parent = NULL;
if (callback::show_setting_ui) if (callback::show_setting_ui)
@ -3592,7 +3592,7 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_progress(HWND parent, bool bIndicator))
is_bIndicator = bIndicator; is_bIndicator = bIndicator;
if (is_bIndicator) if (is_bIndicator)
ui_notify = std::function<void(int, void*, int)>(); ui_notify = std::function<void(int, void*, int)>();
if (!IsWindowVisible(parent)) if (!IsWindow(parent) || !IsWindowVisible(parent))
parent = NULL; parent = NULL;
auto ui_process = [this](ui_result res) auto ui_process = [this](ui_result res)