From b68b36e6fd7dfbe425902d67c214b350ebef5253 Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 3 Sep 2008 11:04:14 +0000 Subject: [PATCH] Test if engine is started in jackctl_server_load_internal and jackctl_server_unload_internal. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2867 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackControlAPI.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/common/JackControlAPI.cpp b/common/JackControlAPI.cpp index 3d5a5132..3a8c48dd 100644 --- a/common/JackControlAPI.cpp +++ b/common/JackControlAPI.cpp @@ -1034,21 +1034,25 @@ EXPORT const JSList * jackctl_internal_get_parameters(jackctl_internal *internal } EXPORT bool jackctl_server_load_internal( - jackctl_server * server, + jackctl_server * server_ptr, jackctl_internal * internal) { int status; - server->engine->InternalClientLoad(internal->desc_ptr->name, internal->desc_ptr->name, internal->set_parameters, JackNullOption, &internal->refnum, &status); - return (internal->refnum > 0); + if (server_ptr->engine != NULL) { + server_ptr->engine->InternalClientLoad(internal->desc_ptr->name, internal->desc_ptr->name, internal->set_parameters, JackNullOption, &internal->refnum, &status); + return (internal->refnum > 0); + } else { + return false; + } } EXPORT bool jackctl_server_unload_internal( - jackctl_server * server, + jackctl_server * server_ptr, jackctl_internal * internal) { int status; - if (internal->refnum > 0) { - return (server->engine->GetEngine()->InternalClientUnload(internal->refnum, &status)); + if (server_ptr->engine != NULL && internal->refnum > 0) { + return (server_ptr->engine->GetEngine()->InternalClientUnload(internal->refnum, &status)); } else { return false; }