From e32cfac71bdbeef71e3fe911f42852c4b208e6e5 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Mon, 8 Nov 2010 15:35:24 +0100
Subject: [PATCH] Add non daemon mode

---
 Connector_RTMP/main.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Connector_RTMP/main.cpp b/Connector_RTMP/main.cpp
index f04c6de2..a56e8c9d 100644
--- a/Connector_RTMP/main.cpp
+++ b/Connector_RTMP/main.cpp
@@ -31,7 +31,7 @@ void termination_handler (int signum){
   server_socket = 0;
 }
 
-int main(){
+int main(int argc, char ** argv){
   //setup signal handler
   struct sigaction new_action;
   new_action.sa_handler = termination_handler;
@@ -42,7 +42,9 @@ int main(){
   sigaction (SIGTERM, &new_action, NULL);
   
   server_socket = DDV_Listen(1935);
-  if (server_socket > 0){daemon(1, 0);}else{return 1;}
+  if ((argc < 2) || (argv[1] == "nd")){
+    if (server_socket > 0){daemon(1, 0);}else{return 1;}
+  }
   int status;
   while (server_socket > 0){
     waitpid((pid_t)-1, &status, WNOHANG);