Fixed issue with war camo asset paths trailing slash causing camo not…

… to appear in selection
harbdog · Jun 14, 2016 · 7d15f57 · 7d15f57
1 parent 189e8aa
commit 7d15f57
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/grails-app/controllers/roguemek/game/StagingController.groovy b/grails-app/controllers/roguemek/game/StagingController.groovy
@@ -770,6 +770,9 @@ class StagingController {
 			def pathRegex = ~/.*[\\|\/](.*)/
 			Set<String> camoPaths = ContextHelper.getResourcePaths("/assets/images/camo/", false)
 			camoPaths.each { path ->
+				// make sure there are no trailing slashes
+				path = path.replaceAll('/$', "")
+
 				path.find(pathRegex) { fullMatch, regPath ->
 					camoPatternPaths << regPath
 				}
@@ -827,6 +830,9 @@ class StagingController {
 			def pathRegex = ~/.*[\\|\/](.*)/
 			Set<String> camoPaths = ContextHelper.getResourcePaths("/assets/images/camo/${patternPath}", false)
 			camoPaths.each { path ->
+				// make sure there are no trailing slashes
+				path = path.replaceAll('/$', "")
+
 				path.find(pathRegex) { fullMatch, regPath ->
 					camoPatternPaths << regPath
 				}