SANE_EVENT_ERROR不再在USB循环中报告
This commit is contained in:
parent
ca51479e37
commit
56adfaec20
|
@ -2016,9 +2016,9 @@ int hg_scanner::set_setting(int setting_no, void* data, int len)
|
|||
|
||||
if (notify_setting_result_)
|
||||
{
|
||||
name.insert(0, "设置 “");
|
||||
name += "” 值为“";
|
||||
name += type + "” 成功。";
|
||||
name.insert(0, "\350\256\276\347\275\256 \"");
|
||||
name += "\" \345\200\274\344\270\272\"";
|
||||
name += type + "\" \346\210\220\345\212\237\343\200\202";
|
||||
notify_ui_working_status(name.c_str());
|
||||
}
|
||||
}
|
||||
|
@ -2030,9 +2030,9 @@ int hg_scanner::set_setting(int setting_no, void* data, int len)
|
|||
setting_jsn_.at(sn).at("title").get_to(name);
|
||||
}
|
||||
else
|
||||
name = std::string("设置项") + sn;
|
||||
name.insert(0, "设置 “");
|
||||
name += "” 值失败: " + hg_scanner::strerr((scanner_err)ret);
|
||||
name = std::string("\350\256\276\347\275\256\351\241\271") + sn;
|
||||
name.insert(0, "\350\256\276\347\275\256 \"");
|
||||
name += "\" \345\200\274\345\244\261\350\264\245: " + hg_scanner::strerr((scanner_err)ret);
|
||||
notify_ui_working_status(name.c_str());
|
||||
}
|
||||
|
||||
|
|
|
@ -384,8 +384,8 @@ void hg_scanner_200::thread_handle_usb_read(void)
|
|||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err);
|
||||
//else
|
||||
// notify_ui_working_status(hg_scanner::error_description((scanner_err)prev_err).c_str(), SANE_EVENT_ERROR, prev_err);
|
||||
prev_err = ret;
|
||||
}
|
||||
this_thread::sleep_for(chrono::milliseconds(2));
|
||||
|
|
Loading…
Reference in New Issue