diff --git a/build.sh b/build.sh index 1d0fcb5..fa47188 100755 --- a/build.sh +++ b/build.sh @@ -88,11 +88,12 @@ make if [ $? -ne 0 ];then echo "--------------------------------------make fail---------------------------------------" - exit 1 -fi + #exit 1 # commented, we should restore the CMakeLists.txts... +else echo "--------------------------------------make succeed------------------------------------" +fi -make +#make if [ -f ../code_device/hgsane/CMakeLists.txtbkp ]; then mv ../code_device/hgsane/CMakeLists.txtbkp ../code_device/hgsane/CMakeLists.txt diff --git a/hgdriver/hgdev/hg_scanner_200.cpp b/hgdriver/hgdev/hg_scanner_200.cpp index dc8985d..3f3e001 100644 --- a/hgdriver/hgdev/hg_scanner_200.cpp +++ b/hgdriver/hgdev/hg_scanner_200.cpp @@ -384,8 +384,11 @@ void hg_scanner_200::thread_handle_usb_read(void) break; } } - //else + else + { // notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err); + HG_VLOG_MINI_1(LOG_LEVEL_WARNING, "-x-x-x-: USB thread error: %s\n", hg_scanner::strerr((scanner_err)prev_err).c_str()); + } prev_err = ret; } this_thread::sleep_for(chrono::milliseconds(2));