From 3a68cba8299fb6628abe5d3623ceba65a6092262 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Wed, 12 Apr 2023 19:35:01 +0800
Subject: [PATCH] =?UTF-8?q?SaneUI=E6=98=BE=E7=A4=BA=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8Cparent=E4=B8=BANULL=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=85=E4=BA=8E=E5=B1=8F=E5=B9=95=E4=B8=AD=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/saneui/HGSaneUI.cpp   | 49 +++++++++++++++++++++++++----------
 modules/saneui/qwinwidget.cpp |  2 +-
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/modules/saneui/HGSaneUI.cpp b/modules/saneui/HGSaneUI.cpp
index e08f7b0d..a1565682 100644
--- a/modules/saneui/HGSaneUI.cpp
+++ b/modules/saneui/HGSaneUI.cpp
@@ -28,8 +28,11 @@ int show_srclist_ui(const char **manuNames, const char **sanePaths, HGWindow par
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
@@ -73,8 +76,11 @@ int show_devlist_ui(const SANEAPI* saneApi, const char **devNames, HGWindow pare
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
@@ -116,8 +122,11 @@ int show_setting_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devN
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
@@ -147,8 +156,11 @@ int show_scan_ui(const SANEAPI* saneApi, SANE_Handle handle, const char *devName
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
@@ -177,8 +189,11 @@ int show_msgbox_info(const char *title, const char *text, HGWindow parent)
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
@@ -197,8 +212,11 @@ int show_msgbox_warning(const char *title, const char *text, HGWindow parent)
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
@@ -218,8 +236,11 @@ int show_twain_srclist_ui(DSMENTRYPROC dsmProc, const TW_IDENTITY *appId, HGWind
     if (!g_ownApplication)
         g_ownApplication = QMfcApp::pluginInstance(g_hInst);
     QWinWidget win(parent);
-    win.showCentered();
-    qParent = &win;
+    if (nullptr != parent)
+    {
+        win.showCentered();
+        qParent = &win;
+    }
 #else
     qParent = parent;
 #endif
diff --git a/modules/saneui/qwinwidget.cpp b/modules/saneui/qwinwidget.cpp
index 491970e1..2c0334e1 100644
--- a/modules/saneui/qwinwidget.cpp
+++ b/modules/saneui/qwinwidget.cpp
@@ -83,7 +83,7 @@ QWinWidget::QWinWidget(CWnd *parentWnd, QObject *parent, Qt::WindowFlags f)
 
 void QWinWidget::init() 
 {
-    Q_ASSERT(hParent);
+    //Q_ASSERT(hParent);
 
     if (hParent) {
 #if QT_VERSION >= 0x050000