diff options
| author | David Robillard <d@drobilla.net> | 2011-09-23 22:00:38 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-09-23 22:00:38 +0000 |
| commit | 41f1be0a68676f33dc1d7dfbb32c5d6440ebd4c9 (patch) | |
| tree | 4803c07d4d3ebf85093068d94484dd7029a57389 /src/shared/ResourceImpl.cpp | |
| parent | 1af9036d30ba65c6ec5e04902cdfdcfc88478e62 (diff) | |
| download | ingen-41f1be0a68676f33dc1d7dfbb32c5d6440ebd4c9.tar.gz ingen-41f1be0a68676f33dc1d7dfbb32c5d6440ebd4c9.tar.bz2 ingen-41f1be0a68676f33dc1d7dfbb32c5d6440ebd4c9.zip | |
Fix broken iterator use (memory errors on erase) in ResourceImpl::set_property.
Load all required modules before starting jack (Jack went crazy sometimes otherwise, particularly with ingen running in gdb).
Fix insane non-const reference return to Resource::set_property.
Exit cleanly on interrupt (Ctrl-C) and terminate (kill).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3480 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared/ResourceImpl.cpp')
| -rw-r--r-- | src/shared/ResourceImpl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/shared/ResourceImpl.cpp b/src/shared/ResourceImpl.cpp index 14227ccf..729a8152 100644 --- a/src/shared/ResourceImpl.cpp +++ b/src/shared/ResourceImpl.cpp @@ -39,17 +39,19 @@ ResourceImpl::add_property(const Raul::URI& uri, const Raul::Atom& value) _properties.insert(make_pair(uri, value)); } -Raul::Atom& +const Raul::Atom& ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value, Resource::Graph ctx) { // Erase existing property in this context for (Properties::iterator i = _properties.find(uri); - (i != _properties.end()) && (i->first == uri); - ++i) { + (i != _properties.end()) && (i->first == uri);) { + Properties::iterator next = i; + ++next; if (i->second.context() == ctx && i->second == value) { _properties.erase(i); } + i = next; } // Insert new property @@ -84,7 +86,7 @@ ResourceImpl::has_property(const Raul::URI& uri, const Raul::Atom& value) const return false; } -Raul::Atom& +const Raul::Atom& ResourceImpl::set_property(const Raul::URI& uri, const Raul::Atom& value) const { return const_cast<ResourceImpl*>(this)->set_property(uri, value); |