summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-10 01:53:40 +0000
committerDavid Robillard <d@drobilla.net>2012-05-10 01:53:40 +0000
commit85bdf76025a401c82bdd183d5455444a78d89d3a (patch)
tree19aa81c87c56e76be6c3ed3b8f210ba23b1987dd
parent2453f29e46c1aac46a2177ccb392d642d0069320 (diff)
downloadingen-85bdf76025a401c82bdd183d5455444a78d89d3a.tar.gz
ingen-85bdf76025a401c82bdd183d5455444a78d89d3a.tar.bz2
ingen-85bdf76025a401c82bdd183d5455444a78d89d3a.zip
Don't double initialize Jack when running ingen -eg
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4332 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--src/gui/ConnectWindow.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp
index 6c5a8e2b..4d26e61c 100644
--- a/src/gui/ConnectWindow.cpp
+++ b/src/gui/ConnectWindow.cpp
@@ -195,15 +195,14 @@ ConnectWindow::connect(bool existing)
} else
#endif
if (_mode == INTERNAL) {
- if (!world->local_engine())
+ if (!world->local_engine()) {
world->load_module("server");
+ world->load_module("jack");
+ world->local_engine()->activate();
+ }
SharedPtr<SigClientInterface> client(new SigClientInterface());
- world->load_module("jack");
-
- world->local_engine()->activate();
-
_app->attach(client);
_app->register_callbacks();