增加对设置界面或进度指示器父窗口有效性的检查
This commit is contained in:
parent
0eaf2a42f4
commit
b071d7d4b7
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue