From 2407b9a5cbf8065ebdc53f7d822add4203fafe5d Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Sat, 24 Aug 2024 11:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=8C=89=E9=94=AE=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=B7=A5=E5=85=B7=E6=96=87=E4=BB=B6=E5=A4=B9=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=EF=BC=9BBUG-1266?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scantool/form_saveparam.cpp | 31 +++++++------------------------
 app/scantool/form_saveparam.h   |  1 -
 app/scantool/mainwindow.cpp     |  5 +++++
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/scantool/form_saveparam.cpp b/app/scantool/form_saveparam.cpp
index 4bc99fe9..6cb79f32 100644
--- a/app/scantool/form_saveparam.cpp
+++ b/app/scantool/form_saveparam.cpp
@@ -9,7 +9,6 @@ Form_SaveParam::Form_SaveParam(const SaveParam &saveParam, QWidget *parent)
     : QWidget(parent)
     , ui(new Ui::Form_SaveParam)
     , m_writeSettingsDlg(nullptr)
-    , m_qFileDialog(nullptr)
 {
     ui->setupUi(this);
 
@@ -58,7 +57,6 @@ Form_SaveParam::Form_SaveParam(const SaveParam &saveParam, QWidget *parent)
 Form_SaveParam::~Form_SaveParam()
 {
     assert(nullptr == m_writeSettingsDlg);
-    assert(nullptr == m_qFileDialog);
     delete ui;
 }
 
@@ -207,34 +205,19 @@ void Form_SaveParam::on_closeDevice()
 {
     if (nullptr != m_writeSettingsDlg)
         m_writeSettingsDlg->reject();
-    if (nullptr != m_qFileDialog)
-        m_qFileDialog->reject();
 }
 
 void Form_SaveParam::on_btn_directory_clicked()
 {
-    assert(nullptr == m_qFileDialog);
-    m_qFileDialog = new QFileDialog(this);
-    m_qFileDialog->setFileMode(QFileDialog::Directory);
-    m_qFileDialog->setViewMode(QFileDialog::Detail);
-    m_qFileDialog->setWindowTitle("Browse directory");
-    m_qFileDialog->setDirectory(ui->lineEdit_directory->text());
-    if (m_qFileDialog->exec())
+    QString save_dir = QFileDialog::getExistingDirectory(this, tr("Browse directory"), "");
+    if (!save_dir.isEmpty())
     {
-        QString save_dir = m_qFileDialog->directory().absolutePath();
-        if (!save_dir.isEmpty())
-        {
-            if (save_dir[save_dir.size() - 1] != '/')
-                save_dir += "/";
-
-            char result[512] = {0};
-            HGBase_StandardiseFileName(save_dir.toStdString().c_str(), result, 512);
-            ui->lineEdit_directory->setText(QString::fromStdString(result));
-        }
+        if (save_dir[save_dir.size() - 1] != '/')
+            save_dir += "/";
+        char result[512] = {0};
+        HGBase_StandardiseFileName(save_dir.toStdString().c_str(), result, 512);
+        ui->lineEdit_directory->setText(QString::fromStdString(result));
     }
-
-    delete m_qFileDialog;
-    m_qFileDialog = nullptr;
 }
 
 void Form_SaveParam::on_btn_option_clicked()
diff --git a/app/scantool/form_saveparam.h b/app/scantool/form_saveparam.h
index 7dddcce8..ae26db3e 100644
--- a/app/scantool/form_saveparam.h
+++ b/app/scantool/form_saveparam.h
@@ -70,7 +70,6 @@ private:
     Ui::Form_SaveParam *ui;
     WriteParam m_writeParam;
     Dialog_WriteSettings *m_writeSettingsDlg;
-    QFileDialog *m_qFileDialog;
 };
 
 #endif // FORM_SAVEPARAM_H
diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp
index 4dba7f03..a18190d5 100644
--- a/app/scantool/mainwindow.cpp
+++ b/app/scantool/mainwindow.cpp
@@ -1471,6 +1471,11 @@ void MainWindow::on_pushButtonModify_clicked()
     {
         deviceType = v;
     }
+    else
+    {
+        QMessageBox::information(this, tr("Tips"), sane_err_desc(status));
+        return;
+    }
 
     if (deviceType != m_vScanParams[index].deviceType)
     {