diff options
| author | David Robillard <d@drobilla.net> | 2008-05-15 00:43:05 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-05-15 00:43:05 +0000 |
| commit | d5cc3f720e50583f172425fbebf401e6be0c8b78 (patch) | |
| tree | 6fe9efb22ef8f26860efc2de4a077e619a530f42 /src/libs/client | |
| parent | eb10d32d8b59f2158ba64ba55e310ba0f5f24170 (diff) | |
| download | ingen-d5cc3f720e50583f172425fbebf401e6be0c8b78.tar.gz ingen-d5cc3f720e50583f172425fbebf401e6be0c8b78.tar.bz2 ingen-d5cc3f720e50583f172425fbebf401e6be0c8b78.zip | |
Show error messages from engine in a pop-up dialog.
Don't attempt to create root patch when loading deprecated (.om) patches.
git-svn-id: http://svn.drobilla.net/lad/ingen@1208 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client')
| -rw-r--r-- | src/libs/client/DeprecatedLoader.cpp | 2 | ||||
| -rw-r--r-- | src/libs/client/Store.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/client/DeprecatedLoader.cpp b/src/libs/client/DeprecatedLoader.cpp index b193c86f..ffe9da14 100644 --- a/src/libs/client/DeprecatedLoader.cpp +++ b/src/libs/client/DeprecatedLoader.cpp @@ -221,7 +221,7 @@ DeprecatedLoader::load_patch(const Glib::ustring& filename, poly = 1; // Create it, if we're not merging - if (!existing) { + if (!existing && path != "/") { _engine->create_patch(path, poly); for (GraphObject::Variables::const_iterator i = initial_data.begin(); i != initial_data.end(); ++i) _engine->set_variable(path, i->first, i->second); diff --git a/src/libs/client/Store.cpp b/src/libs/client/Store.cpp index 60c03049..b679b01a 100644 --- a/src/libs/client/Store.cpp +++ b/src/libs/client/Store.cpp @@ -33,8 +33,8 @@ namespace Client { Store::Store(SharedPtr<EngineInterface> engine, SharedPtr<SigClientInterface> emitter) -: _engine(engine) -, _emitter(emitter) + : _engine(engine) + , _emitter(emitter) { emitter->signal_object_destroyed.connect(sigc::mem_fun(this, &Store::destruction_event)); emitter->signal_object_renamed.connect(sigc::mem_fun(this, &Store::rename_event)); |