Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

If running in Batch mode for automatic print testing, don't stop on a fatal error.

Browse Source 
Fixed a null reference error.  If box is null don't try to update it's properties.
This commit is contained in:
Rich 2014-01-13 16:05:46 +00:00
parent ead8f91a2b
commit 581c437861
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/VEPROMS User Interface/Program.cs
View File

@ -62,7 +62,8 @@ namespace VEPROMS
dpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\ErrorLog.txt"; dpath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\VEPROMS\ErrorLog.txt";
_log.Error("Proms Main ThreadException", e.Exception); _log.Error("Proms Main ThreadException", e.Exception);
string msg = string.Format("An error has occurred so the program will terminate. Please send the error log, {0}, to Volian.",dpath); string msg = string.Format("An error has occurred so the program will terminate. Please send the error log, {0}, to Volian.",dpath);
MessageBox.Show(msg); if(!System.Environment.CommandLine.Contains("/P="))
MessageBox.Show(msg);
Application.Exit(); Application.Exit();
} }
} }

2
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -226,7 +226,7 @@ namespace Volian.Print.Library
// increment the y offset if not doing the ComponentTableFormat // increment the y offset if not doing the ComponentTableFormat
else if (!para.UseTemplateKeepOnCurLine(childItemInfo)) else if (!para.UseTemplateKeepOnCurLine(childItemInfo))
yoff = para.YBottomMost; yoff = para.YBottomMost;
if (childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.BoxIt) if (box != null && childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.BoxIt)
{ {
box.Height = yoff - box.YOffset - (1.1F * vlnPrintObject.SixLinesPerInch); box.Height = yoff - box.YOffset - (1.1F * vlnPrintObject.SixLinesPerInch);
box = null; // if doing boxed steps, only do single sibling at a time. box = null; // if doing boxed steps, only do single sibling at a time.