From 5052883db280f68a83b3b99b500aafef940f4fc3 Mon Sep 17 00:00:00 2001
From: marrold <marrold@users.noreply.github.com>
Date: Mon, 13 Mar 2017 13:45:41 +0000
Subject: [PATCH] Removes presumptions on MMDVMHost restart method.

Removes presumptions on MMDVMHost restart method, uses the already defined 'REBOOTMMDVM' instead.
---
 scripts/switchnetwork.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/scripts/switchnetwork.php b/scripts/switchnetwork.php
index b98af3d..04f6011 100644
--- a/scripts/switchnetwork.php
+++ b/scripts/switchnetwork.php
@@ -56,19 +56,12 @@ include "../include/sysinfo.php";
 if ($_GET['network'] == "DMRPLUS") {
    setDMRNetwork("DMRplus");
    exec( "sudo cp ".MMDVMINIPATH."/DMRPLUS.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME );
-   exec( "sudo killall MMDVMHost");
-   sleep(1);
-   exec( "sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." > /dev/null 2>&1 &" );
-// exec( "sudo killall MMDVMHost && sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." &");
-// exec( "sudo /etc/init.d/start_mmdvm restart ");
+   exec( REBOOTMMDVM );
 }
 if ($_GET['network'] == "BRANDMEISTER") {
    setDMRNetwork("BrandMeister");
    exec( "sudo cp ".MMDVMINIPATH."/BRANDMEISTER.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME );
-   exec( "sudo killall MMDVMHost");
-   sleep(1);
-   exec( "sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME."  > /dev/null 2>&1 &" );
-// exec( "sudo killall MMDVMHost && sudo ".MMDVMHOSTPATH."/MMDVMHost ".MMDVMINIPATH."/".MMDVMINIFILENAME." &" );
+   exec( REBOOTMMDVM );
 }
 ?>
 <div class="alert alert-info" role="alert">Switching network to <b><?php echo getDMRNetwork2() ?></b><br>Restarting in new selected network in progress</div>