Skip to content

Commit 96d6350

Browse files
committed
Automatic merge of T1.6-rc8-48-ga5be12922 and 14 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at ba9e40a: Status in Work Orders popup set too fast - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1155 at 40f8c34: fix for illegal characters in refeerence to Shape file - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
16 parents d07f977 + a5be129 + e10390b + 2e06f85 + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + 8ae6bb7 + ba9e40a + 66dfd09 + 40f8c34 + 5845a1a + 689494b + fab5457 + 1d7643d commit 96d6350

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

Source/RunActivity/Viewer3D/Scenery.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,16 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
332332
var shapeFilePath = fileNameIsNotShape || String.IsNullOrEmpty(worldObject.FileName) ? null : global ? viewer.Simulator.BasePath + @"\Global\Shapes\" + worldObject.FileName : viewer.Simulator.RoutePath + @"\Shapes\" + worldObject.FileName;
333333
if (shapeFilePath != null)
334334
{
335-
shapeFilePath = Path.GetFullPath(shapeFilePath);
335+
try
336+
{
337+
shapeFilePath = Path.GetFullPath(shapeFilePath);
338+
}
339+
catch (Exception e)
340+
{
341+
Trace.TraceWarning("Invalid reference in World file {0} to scenery file {1} for {2}: {3}", WFilePath, shapeFilePath, worldObject.FileName, e.Message);
342+
Trace.TraceInformation("Illegal characters in a file path are: \\ / : * ? \" < > |");
343+
shapeFilePath = null;
344+
}
336345
if (!File.Exists(shapeFilePath))
337346
{
338347
Trace.TraceWarning("{0} scenery object {1} with StaticFlags {3:X8} references non-existent {2}", WFileName, worldObject.UID, shapeFilePath, worldObject.StaticFlags);

0 commit comments

Comments
 (0)