From e5c060f9171b8961458bdc30399e207c133499eb Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Wed, 6 Dec 2023 10:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E4=BA=A7=E7=B3=BB=E7=BB=9F=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9twainui----show=5Fsetting=5Fui=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/sane_user/HGSaneImpl.cpp     | 2 +-
 modules/twainui/hg_settingdialog.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/sane_user/HGSaneImpl.cpp b/modules/sane_user/HGSaneImpl.cpp
index 3f1dd708..dd2f0988 100644
--- a/modules/sane_user/HGSaneImpl.cpp
+++ b/modules/sane_user/HGSaneImpl.cpp
@@ -870,7 +870,7 @@ HGResult HGSaneDeviceImpl::ShowSettingDlg(HGWindow parent)
     }
 
     m_curDevice = this;
-    int ret = show_setting_ui(m_devHandle, parent, &m_sourceImpl->m_saneApi, m_devName.c_str(), false, UIResultCallback);
+    int ret = show_setting_ui(m_devHandle, parent, &m_sourceImpl->m_saneApi, m_devName.c_str(), false, UIResultCallback, nullptr);
     if (0 != ret)
     {
         return HGSANE_ERR_FAIL;
diff --git a/modules/twainui/hg_settingdialog.cpp b/modules/twainui/hg_settingdialog.cpp
index a2ed3119..da3020c7 100644
--- a/modules/twainui/hg_settingdialog.cpp
+++ b/modules/twainui/hg_settingdialog.cpp
@@ -86,7 +86,10 @@ hg_settingdialog::hg_settingdialog(class Manager *mgr, SANE_Handle handle, const
     connect(comb_, SIGNAL(currentTextChanged(const QString)), this, SLOT(on_current_scheme_changed())); 
     connect(this, SIGNAL(scan_status(QString,bool)),this, SLOT(on_scan_status(QString, bool)), Qt::QueuedConnection);
 
-    *notify = FuncNotify;
+    if (notify != nullptr)
+    {
+        *notify = FuncNotify;
+    }
 }
 
 hg_settingdialog::~hg_settingdialog()