diff options
| author | David Robillard <d@drobilla.net> | 2012-07-26 15:27:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-07-26 15:27:03 +0000 |
| commit | 3c5931bb13b5f88edcebb375fa6964dde8b85563 (patch) | |
| tree | 9801897576b7fb9d8a9f700847c670f216fc93b7 /src/server/events/Move.cpp | |
| parent | b83ed4f83cf4c9b5054dcf55bea710313c369633 (diff) | |
| download | ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.tar.gz ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.tar.bz2 ingen-3c5931bb13b5f88edcebb375fa6964dde8b85563.zip | |
Report subject with errors to client for more meaningful error messages.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4556 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events/Move.cpp')
| -rw-r--r-- | src/server/events/Move.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 9a894e43..483c77e7 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -55,16 +55,16 @@ Move::pre_process() Glib::RWLock::WriterLock lock(_engine.engine_store()->lock()); if (!_old_path.parent().is_parent_of(_new_path)) { - return Event::pre_process_done(PARENT_DIFFERS); + return Event::pre_process_done(PARENT_DIFFERS, _new_path); } _store_iterator = _engine.engine_store()->find(_old_path); if (_store_iterator == _engine.engine_store()->end()) { - return Event::pre_process_done(NOT_FOUND); + return Event::pre_process_done(NOT_FOUND, _old_path); } if (_engine.engine_store()->find_object(_new_path)) { - return Event::pre_process_done(EXISTS); + return Event::pre_process_done(EXISTS, _new_path); } SharedPtr< Raul::Table< Raul::Path, SharedPtr<GraphObject> > > removed @@ -106,8 +106,7 @@ Move::execute(ProcessContext& context) void Move::post_process() { - respond(_status); - if (!_status) { + if (!respond()) { _engine.broadcaster()->move(_old_path, _new_path); } } |