summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpius.lee <pius.lee@samsung.com>2016-11-24 10:58:47 +0900
committerpius.lee <pius.lee@samsung.com>2016-11-24 10:58:47 +0900
commit6608f52ed733573561748e07922b20ea665c0562 (patch)
tree275312e23911b17629e5e873d74774ea579e7946
parentd1996eaf33451d4c9ceb207247c8c2f33107ab09 (diff)
downloadlauncher-6608f52ed733573561748e07922b20ea665c0562.tar.gz
launcher-6608f52ed733573561748e07922b20ea665c0562.tar.bz2
launcher-6608f52ed733573561748e07922b20ea665c0562.zip
Fix missed ni.dll in tpa list
Change-Id: I42a2bad8ebde5b6c056b2f12a5145ba31eda1d98
-rw-r--r--NativeLauncher/util/utils.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/NativeLauncher/util/utils.cc b/NativeLauncher/util/utils.cc
index 2cc1026..df30ed0 100644
--- a/NativeLauncher/util/utils.cc
+++ b/NativeLauncher/util/utils.cc
@@ -248,7 +248,14 @@ void AssembliesInDirectory(const std::vector<std::string>& directories, std::str
}
AssemblyFile f = {noext, ext};
- addedAssemblies[f] = ni;
+ if (addedAssemblies.find(f) == addedAssemblies.end())
+ {
+ addedAssemblies[f] = ni;
+ }
+ else
+ {
+ addedAssemblies[f] |= ni;
+ }
}
};