From f98aa287d37918c9d8ff9220459a0c6305adde37 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Thu, 21 Aug 2003 14:17:33 +0000
Subject: only offer to configure xawtv if bttv was configured

---
 perl-install/standalone/drakxtv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index dc267258a..1a50920d1 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -131,17 +131,17 @@ You can install it by typing \"urpmi xawtv\" as root, in a console.")));
 my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' || $_->{driver} eq 'usbvision' } detect_devices::probeall();
 push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices;
 if (@devices) {
+    my $not_canceled = 1;
     # TODO: That need some work for multiples TV cards
     foreach (@devices) {
 	   if ($< == 0 && (grep { detect_devices::isTVcard($_) } @devices)) {
 		  require harddrake::v4l;
 		  require modules;
-		  no strict 'subs';
 		  modules::read_conf();
-		  harddrake::v4l::config($in, $_->{driver});
+		  $not_canceled &&= harddrake::v4l::config($in, $_->{driver});
 		  modules::write_conf();
 	   }
-	   scan4channels();
+	   scan4channels() if $not_canceled;
     }
 } else {
     $in->ask_warn(N("No TV Card detected!"), formatAlaTeX(
-- 
cgit v1.2.1