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

扫描进度界面点击“取消”时，通知UI扫描结束;配置管理界面在编辑配置方案名称时，偶发崩溃

This commit is contained in:
gb 2023-02-14 11:14:42 +08:00
parent b9abfad34b
commit d1897e2f32
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sane/DlgCfgMgr.cpp
View File

@ -107,7 +107,7 @@ void dlg_cfg_mgr::handle_notify(UINT id, LPNMHDR pnhdr)
{ {
LPNMLVDISPINFOW pdisp = (LPNMLVDISPINFOW)pnhdr; LPNMLVDISPINFOW pdisp = (LPNMLVDISPINFOW)pnhdr;
label_ = pdisp->item.pszText; label_ = pdisp->item.pszText ? pdisp->item.pszText : L"";
} }
else if (pnhdr->code == LVN_ENDLABELEDITW) else if (pnhdr->code == LVN_ENDLABELEDITW)
{ {

1
twain/twain/huagaods.cpp
View File

@ -3115,6 +3115,7 @@ int huagao_ds::handle_scanner_event(int ev)
case SANE_EVENT_UI_CLOSE_CANCEL: case SANE_EVENT_UI_CLOSE_CANCEL:
scanner_->stop(); scanner_->stop();
// notifyEndWithoutImages(); // notifyEndWithoutImages();
notifyCloseCancel(); // 修复点击进度框"取消"按钮，UI不能正常结束的BUG - added on 2023-02-14
break; break;
case SANE_EVENT_UI_CLOSE_NORMAL: case SANE_EVENT_UI_CLOSE_NORMAL:
scanner_->ui_hide(); scanner_->ui_hide();