[Libreoffice-commits] core.git: vcl/source

Caolán McNamara caolanm at redhat.com
Wed May 6 05:14:00 PDT 2015


 vcl/source/gdi/print3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5ce36800b1669da08ab6440bc2f8bc2bd305ded
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 6 13:12:35 2015 +0100

    assert on attempt to print after cancel
    
    Change-Id: I46dadf9be542990ef18d78a54d7ebce3c3df80f9

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index e553293..b8ed8d5 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -525,9 +525,9 @@ void Printer::ImplPrintJob(std::shared_ptr<PrinterController> xController,
 {
     if (PreparePrintJob(xController, i_rInitSetup))
     {
-        ExecutePrintJob( xController );
-        FinishPrintJob( xController );
+        ExecutePrintJob(xController);
     }
+    FinishPrintJob(xController);
 }
 
 bool Printer::StartJob( const OUString& i_rJobName, std::shared_ptr<vcl::PrinterController>& i_xController)


More information about the Libreoffice-commits mailing list