summaryrefslogtreecommitdiffstats
path: root/src/libs/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-10-11 02:31:34 +0000
committerDavid Robillard <d@drobilla.net>2007-10-11 02:31:34 +0000
commit8defdcb32f4421c9d124767d1c677c05791ead55 (patch)
treed323293739b2c0ec78f0cf776265d882941c2e52 /src/libs/client
parentc7f3a28390e651e03a68b664086351788a6a2d73 (diff)
downloadingen-8defdcb32f4421c9d124767d1c677c05791ead55.tar.gz
ingen-8defdcb32f4421c9d124767d1c677c05791ead55.tar.bz2
ingen-8defdcb32f4421c9d124767d1c677c05791ead55.zip
Fix Gtk rendering corruption problems when running monolithic (internal engine).
Reduce Gtk main loop overhead when running monolithic. Fix crash on importing certain Om patches. git-svn-id: http://svn.drobilla.net/lad/ingen@870 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client')
-rw-r--r--src/libs/client/DeprecatedLoader.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp
index 5e724c1c..8c8d3936 100644
--- a/src/libs/client/DeprecatedLoader.cpp
+++ b/src/libs/client/DeprecatedLoader.cpp
@@ -183,8 +183,7 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename,
key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if ((!xmlStrcmp(cur->name, (const xmlChar*)"name"))) {
- if (load_name) {
- assert(key != NULL);
+ if (load_name && key) {
if (parent_path)
path = Path(parent_path.get()).base() + nameify_if_invalid((char*)key);
else
@@ -598,7 +597,6 @@ DeprecatedLoader::load_preset(const Path& parent, xmlDocPtr doc, const xmlNodePt
while ((slash_index = port_name.find("/")) != string::npos)
port_name[slash_index] = '-';
- cerr << "ADDING CONTROL: " << node_name << " / " << port_name << " = " << val << endl;
pm->add_control(node_name, port_name, val);
}
}