Merge pull request #461 from NS-Kazuki/image

enable imagefile priority
exch-bms2 · Jul 22, 2019 · fdbde53 · fdbde53
2 parents bf9c1c9 + 3dacb08
commit fdbde53
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/src/bms/player/beatoraja/play/bga/BGAProcessor.java b/src/bms/player/beatoraja/play/bga/BGAProcessor.java
@@ -129,16 +129,27 @@ public synchronized void setModel(BMSModel model) {
 						if (index != -1) {
 							fex = name.substring(index + 1).toLowerCase();
 						}
-						if(fex != null && !(Arrays.asList(mov_extension).contains(fex))){
-							f = dpath.resolve(name);
-						}else if(fex != null){
-							name = name.substring(0, index);
-							for (String mov : mov_extension) {
-								final Path mpgfile = dpath.resolve(name + "." + mov);
-								if (Files.exists(mpgfile)) {
-									f = mpgfile;
-									break;
+						if (fex != null) {
+							if (Arrays.asList(mov_extension).contains(fex)){
+								name = name.substring(0, index);
+								for (String mov : mov_extension) {
+									final Path mpgfile = dpath.resolve(name + "." + mov);
+									if (Files.exists(mpgfile)) {
+										f = mpgfile;
+										break;
+									}
+								}
+							}else if (Arrays.asList(BGImageProcessor.pic_extension).contains(fex)){
+								name = name.substring(0, index);
+								for (String pic : BGImageProcessor.pic_extension) {
+									final Path picfile = dpath.resolve(name + "." + pic);
+									if (Files.exists(picfile)) {
+										f = picfile;
+										break;
+									}
 								}
+							}else{
+								f = dpath.resolve(name);
 							}
 						}
 					}