diff options
| author | David Robillard <d@drobilla.net> | 2006-06-12 04:48:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-12 04:48:20 +0000 |
| commit | efee2b08f575e2c216cffa6f08a928223ab2cedb (patch) | |
| tree | 089fdf9bc89aa04793b03cbfccb438a7a9c9f387 /src/libs/client/PatchLibrarian.cpp | |
| parent | 5818a04533e472820f6c6748b2f07d7d1ca5789a (diff) | |
| download | ingen-efee2b08f575e2c216cffa6f08a928223ab2cedb.tar.gz ingen-efee2b08f575e2c216cffa6f08a928223ab2cedb.tar.bz2 ingen-efee2b08f575e2c216cffa6f08a928223ab2cedb.zip | |
Store memory bug fixes (multiple ref ptr's to the same object, bad),
control panel fixes
git-svn-id: http://svn.drobilla.net/lad/grauph@32 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/client/PatchLibrarian.cpp')
| -rw-r--r-- | src/libs/client/PatchLibrarian.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/client/PatchLibrarian.cpp b/src/libs/client/PatchLibrarian.cpp index 532f512b..930cdccf 100644 --- a/src/libs/client/PatchLibrarian.cpp +++ b/src/libs/client/PatchLibrarian.cpp @@ -359,8 +359,8 @@ PatchLibrarian::load_patch(PatchModel* pm, bool wait, bool existing) { string filename = pm->filename(); - string additional_path = (pm->parent() == NULL) - ? "" : ((PatchModel*)pm->parent())->filename(); + string additional_path = (!pm->parent()) + ? "" : ((PatchModel*)pm->parent().get())->filename(); additional_path = additional_path.substr(0, additional_path.find_last_of("/")); filename = find_file(pm->filename(), additional_path); @@ -409,7 +409,7 @@ PatchLibrarian::load_patch(PatchModel* pm, bool wait, bool existing) if ((!xmlStrcmp(cur->name, (const xmlChar*)"name"))) { if (load_name) { assert(key != NULL); - if (pm->parent() != NULL) { + if (pm->parent()) { path = pm->parent()->base_path() + string((char*)key); } else { path = string("/") + string((char*)key); |