diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index c8de3148..49b10e5b 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -54,7 +54,7 @@ win32 { LIBS += -lgdi32 -lgdiplus -ldbghelp -luser32 -ladvapi32 LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt \ -l$${OEM_PREFIX}ImgProc -l$${OEM_PREFIX}Version - LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsane + LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsanexy # sane.dll LIBS += -L$$PWD/../../../../release/win/$${MY_ARCH}/OEM/$${OEM_NAME} diff --git a/build2/qt/HGScannerLib/HGScannerLib.pro b/build2/qt/HGScannerLib/HGScannerLib.pro index f5957be0..4324056c 100644 --- a/build2/qt/HGScannerLib/HGScannerLib.pro +++ b/build2/qt/HGScannerLib/HGScannerLib.pro @@ -53,7 +53,7 @@ win32 { DEF_FILE = HGScannerLib.def LIBS += -lgdi32 -lgdiplus -ldbghelp LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt -l$${OEM_PREFIX}ImgProc - LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsane + LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsanexy } unix { diff --git a/build2/qt/HGWebService/HGWebService.pro b/build2/qt/HGWebService/HGWebService.pro index 01ce8c5e..a99c3a30 100644 --- a/build2/qt/HGWebService/HGWebService.pro +++ b/build2/qt/HGWebService/HGWebService.pro @@ -60,7 +60,7 @@ win32 { LIBS += -lgdi32 -lgdiplus -ldbghelp -lws2_32 -lShell32 -lUser32 -lwldap32 -lAdvapi32 LIBS += -L$$PWD/../../build/$${MY_OS}/$${OEM_NAME}/$${MY_ARCH}/$${MY_CONFIGURE} -l$${OEM_PREFIX}Base -l$${OEM_PREFIX}ImgFmt -l$${OEM_PREFIX}ImgProc - LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsane + LIBS += -L$$PWD/../../../../sdk/lib/win/$${MY_ARCH}/OEM/$${OEM_NAME} -lsanexy INCLUDEPATH += $$PWD/../../../third_party/libzip/$${MY_OS}/include INCLUDEPATH += $$PWD/../../../third_party/libcurl/$${MY_OS}/include LIBS += $$PWD/../../../third_party/zlib/$${MY_OS}/lib/$${MY_ARCH}/zlib.lib diff --git a/modules/twainui/Manager.cpp b/modules/twainui/Manager.cpp index d3ea3c04..3af550f3 100644 --- a/modules/twainui/Manager.cpp +++ b/modules/twainui/Manager.cpp @@ -337,8 +337,9 @@ void Manager::on_createSettingUi(bool qt) m_settingUiCallback(r); }; - if (m_settingUi == nullptr) - m_settingUi = new hg_settingdialog(this, m_device, &m_api, m_with_scan, m_devName.c_str(), scanner_cfg_, close_prog, qParent); + if (m_settingUi != nullptr) + delete m_settingUi; + m_settingUi = new hg_settingdialog(this, m_device, &m_api, m_with_scan, m_devName.c_str(), scanner_cfg_, close_prog, qParent); m_settingUi->setModal(true); m_settingUi->show(); } @@ -367,8 +368,9 @@ void Manager::on_createProgressUi(bool qt) if(r == UI_RESULT_CLOSE_NORMAL) m_progressUiCallback = std::function(); }; - if (m_progressUi == nullptr) - m_progressUi = new Dialog_progress_ui(this, close_prog, m_notify, qParent); + if (m_progressUi != nullptr) + delete m_progressUi; + m_progressUi = new Dialog_progress_ui(this, close_prog, m_notify, qParent); m_progressUi->setModal(true); m_progressUi->show(); #ifdef HG_CMP_MSC diff --git a/modules/twainui/dialog_progress_ui.cpp b/modules/twainui/dialog_progress_ui.cpp index 0f451b7b..3f7178bb 100644 --- a/modules/twainui/dialog_progress_ui.cpp +++ b/modules/twainui/dialog_progress_ui.cpp @@ -18,6 +18,7 @@ Dialog_progress_ui::Dialog_progress_ui(class Manager *mgr, std::functionsetupUi(this); + setAttribute(Qt::WA_DeleteOnClose, true); #if defined(HG_CMP_MSC) setWindowFlags(Qt::SubWindow | Qt::Popup | Qt::WindowStaysOnTopHint); #else