From db26caf726685e44a8a6fc04e55e2006e2fa4ec5 Mon Sep 17 00:00:00 2001
From: Michele Di Maria <michele@nt2.it>
Date: Sun, 18 Dec 2011 00:37:06 +0100
Subject: Stops the service before doing anything to the configuration. This
 solves a problem during reinstall and saving the settings while the service
 is running.

---
 config/lcdproc-dev/lcdproc.inc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'config/lcdproc-dev')

diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index b82a59e6..5d2d9fb1 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -169,7 +169,9 @@
 		global $g;
 		global $config;
 		global $input_errors;
-
+		
+		/* I just stop the package */
+		lcdproc_action('stop');
 		config_lock();
 
 		$lcdproc_config = $config['installedpackages']['lcdproc']['config'][0];
@@ -201,6 +203,7 @@
 					break;
 				default:
 					lcdproc_warn("The selected com port is not valid!");
+					config_unlock();
 					return;
 			}
 
@@ -481,14 +484,14 @@ EOD;
 			/* generate rc file start and stop */
 			$stop = <<<EOD
 
-if [ `ps auxw |awk '/LCD[d]/ {print $2}'| wc -l` != 0  ]; then
-	ps auxw |awk '/LCD[d]/ {print $2}'|xargs kill
-	sleep 1
-fi
 if [ `ps auxw |awk '/lcdclient.s[h]/ {print $2}'| wc -l` != 0  ]; then
 	ps auxw |awk '/lcdclient.s[h]/ {print $2}'|xargs kill
 	sleep 1
 fi
+if [ `ps auxw |awk '/LCD[d]/ {print $2}'| wc -l` != 0  ]; then
+	ps auxw |awk '/LCD[d]/ {print $2}'|xargs kill
+	sleep 1
+fi
 
 EOD;
 			$start = $stop ."\n";
@@ -507,10 +510,10 @@ EOD;
 			conf_mount_ro();
 
 			/* or restart lcdproc if settings were changed */
-			if(lcdproc_running($_POST['comport'])) {
+			if(lcdproc_running()) {
 				lcdproc_notice("Restarting service lcdproc");
 				lcdproc_action('restart');
-			}
+			}			
 		}
 
 		if((! $lcdproc_config['driver']) || ($lcdproc_config['comport'] == "none")) {
-- 
cgit v1.2.3