From e4789594bf75fafa6e67f8a70c6cdf2d4f076a30 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 15 Dec 2011 18:37:08 +0000 Subject: [PATCH] Fixed bug B2011-056, where the watermarks could not be turned off from the print dialog --- PROMS/VEPROMS User Interface/DlgPrintProcedure.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs index 8b6adf47..a0b9ee1b 100644 --- a/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs +++ b/PROMS/VEPROMS User Interface/DlgPrintProcedure.cs @@ -374,7 +374,7 @@ namespace VEPROMS // If file exists, determine if overwrite checkbox allows overwrite, if not prompt. Volian.Print.Library.Rtf2Pdf.PdfDebug = true; - PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue; + PrintWatermark pw = (btnWaterMarkOn.Checked) ? (PrintWatermark)cbxWaterMark.SelectedValue : PrintWatermark.None; // Determine change bar settings. First get from config & then see if override from dialog. // Also check that format allows override. ChangeBarDefinition cbd = DetermineChangeBarSettings(); @@ -416,7 +416,7 @@ namespace VEPROMS // If file exists, determine if overwrite checkbox allows overwrite, if not prompt. Volian.Print.Library.Rtf2Pdf.PdfDebug = true; - PrintWatermark pw = (PrintWatermark)cbxWaterMark.SelectedValue; + PrintWatermark pw = (btnWaterMarkOn.Checked) ? (PrintWatermark)cbxWaterMark.SelectedValue : PrintWatermark.None; // Determine change bar settings. First get from config & then see if override from dialog. // Also check that format allows override. ChangeBarDefinition cbd = DetermineChangeBarSettings();