From 28d970cad609ff4d4594e70c360955697c2dd4c9 Mon Sep 17 00:00:00 2001 From: kruland Date: Sun, 1 Dec 2013 18:22:45 -0600 Subject: [PATCH] When importing a rkt file, if we cannot find the decal image file on the local disk, we just ignore it. --- .../rocksim/importt/RockSimAppearanceBuilder.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java index 4a05f6ae3..5ade83385 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java @@ -69,12 +69,13 @@ public class RockSimAppearanceBuilder extends AppearanceBuilder { if ("file".equals(name)) { if (value.length() > 0) { final File f = new File(value); - if (!f.exists()) { - //Find out how to get path of current rocksim file - //so I can look in it's directory + if (f.exists()) { + Attachment a = context.getAttachmentFactory().getAttachment(name); + setImage(context.getOpenRocketDocument().getDecalImage(a)); } - Attachment a = context.getAttachmentFactory().getAttachment(name); - setImage(context.getOpenRocketDocument().getDecalImage(a)); + // else { + // If we can't find the file on the filesystem, we just ignore the decal. + //} } } else if ("repeat".equals(name)) { repeat = "1".equals(value);