summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-10-12 08:51:50 +0000
committerDavid Robillard <d@drobilla.net>2008-10-12 08:51:50 +0000
commit55dad47ff74687acd32b2b019ea52b7a33111613 (patch)
tree5efa51344cbc72eaf5f2ff090e9c3ede943f7ab8
parent141c34e297b1ffde3293c42f26181bd3d895b2c4 (diff)
downloadingen-55dad47ff74687acd32b2b019ea52b7a33111613.tar.gz
ingen-55dad47ff74687acd32b2b019ea52b7a33111613.tar.bz2
ingen-55dad47ff74687acd32b2b019ea52b7a33111613.zip
Fix crash on loading .om subpatches with names that aren't legal symbols.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1657 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/client/DeprecatedLoader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index 8d33e4ff..b30c096a 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -569,10 +569,10 @@ DeprecatedLoader::load_subpatch(const string& base_filename, const Path& parent,
cur = cur->next;
}
- cout << "Loading subpatch " << filename << " under " << parent << endl;
+ cout << "[DeprecatedLoader] Loading subpatch " << filename << " under " << parent << endl;
// load_patch sets the passed variable last, so values stored in the parent
// will override values stored in the child patch file
- /*string path = */load_patch(filename, false, parent, Symbol(name), initial_data, false);
+ load_patch(filename, false, parent, Symbol(Symbol::symbolify(name)), initial_data, false);
return false;
}