sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #979 from mitm001/master

Browse Source 
Fixed how AppSetting mergeFrom checks for key mapping.
This commit is contained in:
Paul Speed 2018-12-27 16:56:31 -05:00 committed by GitHub
commit f73d10bb9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-core/src/main/java/com/jme3/system/AppSettings.java
View File

@ -274,7 +274,7 @@ public final class AppSettings extends HashMap<String, Object> {
*/ */
public void mergeFrom(AppSettings other) { public void mergeFrom(AppSettings other) {
for (String key : other.keySet()) { for (String key : other.keySet()) {
if (get(key) == null) { if( !this.containsKey(key) ) {
put(key, other.get(key)); put(key, other.get(key));
} }
} }