hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #169 from kruland2607/master

Browse Source 
When importing a rkt file, if we cannot find the decal image file on the local disk, we just ignore it.
This commit is contained in:
kruland2607 2013-12-01 16:36:21 -08:00
commit c46ce8471d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java
View File

@ -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);