Merge branch 'master' of https://gitee.com/luoliangyi163/hgproject

app/scanner/mainwindow.cpp

@@ -719,8 +719,12 @@ void MainWindow::on_sane_dev_remove(QString devName)
 
 void MainWindow::on_sane_dev_error(QString errorInfo)
 {
+    m_isScanning = false;
     m_wndStatusBar->setDeviceStatusInfo(errorInfo);
     m_dialog_log->add_log(errorInfo, true);
+    m_dialog_log->setScanStatus(m_isScanning);
+    m_dialog_log->updateWigetStaus();
+    set_actions_enabled(!m_isScanning);
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)
@@ -820,7 +824,7 @@ void MainWindow::on_scan_working()
     m_dialog_log->show();
 #endif
     m_wndStatusBar->setDeviceStatusInfo(tr("scan starting..."));
-    set_actions_enabled(false);
+    set_actions_enabled(!m_isScanning);
 }
 
 void MainWindow::on_scan_finish()
@@ -841,7 +845,7 @@ void MainWindow::on_scan_finish()
         m_scanFileName.clear();
     }
     m_wndStatusBar->setDeviceStatusInfo(tr("scan finished"));
-    set_actions_enabled(true);
+    set_actions_enabled(!m_isScanning);
 }
 
 void MainWindow::on_act_thumbnailBar_triggered(bool checked)