summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Funk <juergen.funk_ml@cib.de>2015-05-29 15:22:04 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-05-29 19:20:13 +0000
commita606ef96bf5f297e953874eef253ef7b13bfb944 (patch)
tree11e5d8de355f239b2d0947561f2d6a1d972a9d9c
parent5e1dce449654198956c6c027b308cd20e4d0d828 (diff)
tdf#91720 - after MailMerge print, plain std print is not possible
Reset the batchmode variable, after the batch print job Related: 138d29aa09417eba4d15ade4c9f4dab2620b6326 (cherry picked from commit 1950ad547462fface018aafe7b65d5ceb445648a) Change-Id: I6d8861e53ba6245019213d88d83603bfe932f010 Reviewed-on: https://gerrit.libreoffice.org/15975 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index d51f752463df..20a27c2403af 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -663,6 +663,7 @@ bool CUPSManager::supportsBatchPrint() const
bool CUPSManager::flushBatchPrint()
{
osl::MutexGuard aGuard( m_aCUPSMutex );
+ batchMode = false; // reset the batch print mode
return processPendingJobs();
}