From c1ba9c618b7657cafba74ea9dec83c409b1706e4 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Tue, 23 Oct 2012 11:26:53 +0200
Subject: [PATCH] Fixed all ::Start* paths to no longer require binaries to be
 in the $PATH to work.

---
 src/conn_http.cpp  | 4 ++--
 src/controller.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/conn_http.cpp b/src/conn_http.cpp
index 8aea5a76..a5c4dab0 100644
--- a/src/conn_http.cpp
+++ b/src/conn_http.cpp
@@ -402,8 +402,8 @@ int main(int argc, char ** argv){
   conf.activate();
 
   //start progressive and dynamic handlers from the same folder as this application
-  Util::Procs::Start("progressive", (std::string)(argv[0]) + "Progressive -n");
-  Util::Procs::Start("dynamic", (std::string)(argv[0]) + "Dynamic -n");
+  Util::Procs::Start("progressive", Util::getMyPath() + "MistConnHTTPProgressive -n");
+  Util::Procs::Start("dynamic", Util::getMyPath() + "MistConnHTTPDynamic -n");
   
   while (server_socket.connected() && conf.is_active){
     Socket::Connection S = server_socket.accept();
diff --git a/src/controller.cpp b/src/controller.cpp
index d3af85e7..315fb39c 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -189,7 +189,7 @@ void CheckProtocols(JSON::Value & p){
   for (iter = new_connectors.begin(); iter != new_connectors.end(); iter++){
     if (current_connectors.count(iter->first) != 1 || current_connectors[iter->first] != iter->second || !Util::Procs::isActive(iter->first)){
       Log("CONF", "Starting connector: " + iter->second);
-      Util::Procs::Start(iter->first, iter->second);
+      Util::Procs::Start(iter->first, Util::getMyPath() + iter->second);
     }
   }
 
@@ -230,7 +230,7 @@ void startStream(std::string name, JSON::Value & data){
   if (URL.substr(0, 4) == "push"){
     std::string pusher = URL.substr(7);
     cmd2 = "MistBuffer -s "+name+" "+pusher;
-    Util::Procs::Start(name, cmd2);
+    Util::Procs::Start(name, Util::getMyPath() + cmd2);
     Log("BUFF", "(re)starting stream buffer "+name+" for push data from "+pusher);
   }else{
     if (URL.substr(0, 1) == "/"){
@@ -249,10 +249,10 @@ void startStream(std::string name, JSON::Value & data){
     }
     cmd3 = "MistBuffer -s "+name;
     if (cmd2 != ""){
-      Util::Procs::Start(name, cmd1, cmd2, cmd3);
+      Util::Procs::Start(name, cmd1, Util::getMyPath() + cmd2, Util::getMyPath() + cmd3);
       Log("BUFF", "(re)starting stream buffer "+name+" for ffmpeg data: "+cmd1);
     }else{
-      Util::Procs::Start(name, cmd1, cmd3);
+      Util::Procs::Start(name, cmd1, Util::getMyPath() + cmd3);
       Log("BUFF", "(re)starting stream buffer "+name+" using input file "+URL);
     }
   }