summaryrefslogtreecommitdiffstats
path: root/src/JackDriver.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-12-21 00:13:04 +0000
committerDavid Robillard <d@drobilla.net>2008-12-21 00:13:04 +0000
commit1ac39ebac020c8c020387cda7aaf1524823a3167 (patch)
tree13d7dc21c4233d3476cc3fc0e64ca4dcceb5de38 /src/JackDriver.cpp
parentc3e910cca37092c1eaf125b585753a1d1e0823af (diff)
downloadpatchage-1ac39ebac020c8c020387cda7aaf1524823a3167.tar.gz
patchage-1ac39ebac020c8c020387cda7aaf1524823a3167.tar.bz2
patchage-1ac39ebac020c8c020387cda7aaf1524823a3167.zip
Fix crash for very short lived Jack ports (fix ticket #188).
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1883 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/JackDriver.cpp')
-rw-r--r--src/JackDriver.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/JackDriver.cpp b/src/JackDriver.cpp
index 145ac78..8e9b78f 100644
--- a/src/JackDriver.cpp
+++ b/src/JackDriver.cpp
@@ -149,13 +149,18 @@ JackDriver::create_port_view(Patchage* patchage,
if (id.type == PortID::JACK_ID)
jack_port = jack_port_by_id(_client, id.id.jack_id);
+ if (jack_port == NULL)
+ return boost::shared_ptr<PatchagePort>();
+
+ const int jack_flags = jack_port_flags(jack_port);
+
string module_name, port_name;
port_names(id, module_name, port_name);
ModuleType type = InputOutput;
if (_app->state_manager()->get_module_split(module_name,
- (jack_port_flags(jack_port) & JackPortIsTerminal))) {
- if (jack_port_flags(jack_port) & JackPortIsInput) {
+ (jack_flags & JackPortIsTerminal))) {
+ if (jack_flags & JackPortIsInput) {
type = Input;
} else {
type = Output;
@@ -191,6 +196,7 @@ JackDriver::create_port_view(Patchage* patchage,
boost::shared_ptr<PatchagePort>
JackDriver::create_port(boost::shared_ptr<PatchageModule> parent, jack_port_t* port)
{
+ assert(port);
const char* const type_str = jack_port_type(port);
PortType port_type;