[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Juergen Funk]

 vcl/unx/generic/printer/cupsmgr.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit a606ef96bf5f297e953874eef253ef7b13bfb944
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date:   Fri May 29 15:22:04 2015 +0200

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index d51f752..20a27c2 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();
 }