diff --git a/sane/DlgCfgMgr.cpp b/sane/DlgCfgMgr.cpp index cc61504..5b35962 100644 --- a/sane/DlgCfgMgr.cpp +++ b/sane/DlgCfgMgr.cpp @@ -107,7 +107,7 @@ void dlg_cfg_mgr::handle_notify(UINT id, LPNMHDR pnhdr) { LPNMLVDISPINFOW pdisp = (LPNMLVDISPINFOW)pnhdr; - label_ = pdisp->item.pszText; + label_ = pdisp->item.pszText ? pdisp->item.pszText : L""; } else if (pnhdr->code == LVN_ENDLABELEDITW) { diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp index 9fd8279..1346049 100644 --- a/twain/twain/huagaods.cpp +++ b/twain/twain/huagaods.cpp @@ -3115,6 +3115,7 @@ int huagao_ds::handle_scanner_event(int ev) case SANE_EVENT_UI_CLOSE_CANCEL: scanner_->stop(); // notifyEndWithoutImages(); + notifyCloseCancel(); // 修复点击进度框"取消"按钮,UI不能正常结束的BUG - added on 2023-02-14 break; case SANE_EVENT_UI_CLOSE_NORMAL: scanner_->ui_hide();