From e560f277e840a949e7c9535bb293b658e5a92d95 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Wed, 11 Aug 2004 14:48:49 +0000
Subject: introduce and use isRoamingRunning to detect if the roaming daemon is
 running (woah, sector clear, titi is gone home, no more cvs conflicts)

---
 perl-install/standalone/drakroam | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/perl-install/standalone/drakroam b/perl-install/standalone/drakroam
index cfad91c3a..eab863caf 100755
--- a/perl-install/standalone/drakroam
+++ b/perl-install/standalone/drakroam
@@ -231,9 +231,14 @@ sub UpdateAll {
 	&UpdateRoaming;
 }
 
+sub isRoamingRunning() {
+	my $name = basename($roaming_daemon->{binary});
+	any { /\Q$name\E$/ } run_program::get_stdout("ps", "-A");
+}
+
 sub UpdateRoaming() {
 	my $name = basename($roaming_daemon->{binary});
-	my $status = (any { /\Q$name\E$/ } run_program::get_stdout("ps", "-A")) ? "on" : "off";
+	my $status = isRoamingRunning() ? "on" : "off";
 	$RoamStatus->set_text("Roaming: $status");
 	return FALSE; #- do not update again if launched on timeout
 }
@@ -314,8 +319,10 @@ sub StopRoam() {
 
 sub SetInterval() {
 	$ScanInterval = $ScanEntry->get_text;
-	StopRoam();
-	StartRoam();
+	if (isRoamingRunning()) {
+	    StopRoam();
+	    StartRoam();
+	}
 }
 
 sub ConnectNow {
-- 
cgit v1.2.1