diff options
| author | David Robillard <d@drobilla.net> | 2011-04-19 18:54:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-04-19 18:54:08 +0000 |
| commit | 9887823091ca641bc8da75ffc93d3917fa32d455 (patch) | |
| tree | 31497fc61a0d4745667a27a13ba71c303ce52a88 | |
| parent | 2a0d9d529e713ccf7757129ba87ce25c827a30c2 (diff) | |
| download | ingen-9887823091ca641bc8da75ffc93d3917fa32d455.tar.gz ingen-9887823091ca641bc8da75ffc93d3917fa32d455.tar.bz2 ingen-9887823091ca641bc8da75ffc93d3917fa32d455.zip | |
Fix double/triple engine activation when run with GUI.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3163 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/engine/PatchImpl.cpp | 1 | ||||
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/engine/PatchImpl.cpp b/src/engine/PatchImpl.cpp index e8461ba9..86693686 100644 --- a/src/engine/PatchImpl.cpp +++ b/src/engine/PatchImpl.cpp @@ -79,7 +79,6 @@ void PatchImpl::deactivate() { if (_activated) { - NodeImpl::deactivate(); for (List<NodeImpl*>::iterator i = _nodes.begin(); i != _nodes.end(); ++i) { diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index aaa060ab..f0e5c7b1 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -75,7 +75,6 @@ ConnectWindow::start(Ingen::Shared::World* world) if (_widgets_loaded) { _internal_radio->set_active(true); } - world->local_engine()->activate(); } set_connected_to(world->engine()); @@ -417,7 +416,6 @@ ConnectWindow::gtk_callback() } else if (_connect_stage == 1) { if (_attached) { - App::instance().engine()->activate(); ++_connect_stage; } else { const float ms_since_last = (now.tv_sec - last.tv_sec) * 1000.0f + |