summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-02-19 07:57:24 +0000
committerDavid Robillard <d@drobilla.net>2011-02-19 07:57:24 +0000
commitdfb414f7e636892d79aba9fe1f92f463d4c2b0f7 (patch)
treea9dcda585945ec0c624486c6f28f96eb31dfcb4b /src/shared
parentdb6f76316b6ec7c9ab32f7efd5dce81a976cba82 (diff)
downloadingen-dfb414f7e636892d79aba9fe1f92f463d4c2b0f7.tar.gz
ingen-dfb414f7e636892d79aba9fe1f92f463d4c2b0f7.tar.bz2
ingen-dfb414f7e636892d79aba9fe1f92f463d4c2b0f7.zip
Partially working copy/paste.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2996 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/ClashAvoider.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/shared/ClashAvoider.cpp b/src/shared/ClashAvoider.cpp
index 36244303..9009fe96 100644
--- a/src/shared/ClashAvoider.cpp
+++ b/src/shared/ClashAvoider.cpp
@@ -108,7 +108,9 @@ ClashAvoider::map_path(const Raul::Path& in)
std::stringstream ss;
ss << base_path << "_" << offset;
if (!exists(ss.str())) {
- const string name = (base_path.length() > 1) ? base_path.symbol() : "_";
+ string name = base_path.symbol();
+ if (name == "")
+ name = "_";
string str = ss.str();
InsertRecord i = _symbol_map.insert(make_pair(in, str));
debug << "HIT: offset = " << offset << ", str = " << str << endl;
@@ -148,7 +150,7 @@ ClashAvoider::put(const Raul::URI& path,
const Shared::Resource::Properties& properties,
Resource::Graph ctx)
{
- _target.put(map_uri(path), properties);
+ _target.put(map_uri(path), properties, ctx);
}