extensions/source/scanner/twain32shim.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 8317bd50771c38e720d493f92e32c1b41c510e1f
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Aug 18 10:43:51 2019 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Aug 29 06:07:54 2019 +0200
tdf#126989: always terminate shim after fallback complete
It seems that DSM may not send MSG_CLOSEDSREQ (or we may already have
unloaded DSM), so don't rely on it.
Change-Id: I3ed2e0e70f4dc79c89b430b4bad6954bf9224c71
Reviewed-on: https://gerrit.libreoffice.org/77659
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit 53e4d5fe73d98b109d79fc2c1f5032faea88afb9)
Reviewed-on: https://gerrit.libreoffice.org/77664
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
(cherry picked from commit 704a9a86600a5a60d668140790fc916b5014bef9)
Reviewed-on: https://gerrit.libreoffice.org/77711
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/extensions/source/scanner/twain32shim.cxx
b/extensions/source/scanner/twain32shim.cxx
index 49d6787eb69f..f813ff83d4cb 100644
--- a/extensions/source/scanner/twain32shim.cxx
+++ b/extensions/source/scanner/twain32shim.cxx
@@ -511,8 +511,7 @@ void ImpTwain::ImplFallbackHdl(WPARAM nEvent)
{
if (nEvent > TWAIN_EVENT_NONE)
NotifyParent(nEvent, reinterpret_cast<LPARAM>(m_hMap));
- if (nEvent == TWAIN_EVENT_QUIT)
- PostQuitMessage(0);
+ PostQuitMessage(0);
bFallback = false;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
