From 242444e6f0d888e16d979a859fd4e13c468abfe4 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Thu, 27 Feb 2003 15:17:42 +0000
Subject: Do not ask for the port when the user has chosen an HP MF device as
 scanner model.

---
 perl-install/standalone/scannerdrake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 95facfa73..afc8a864b 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -156,6 +156,10 @@ sub tryConfScanner {
 					removeverticalbar($model)));
 	return 0;
     }
+    if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj)/i) {
+     	$in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", removeverticalbar($model)));
+     	return 0;
+    }
     if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/ || !$port) {
 	$port ||= N("Auto-detect available ports");
 	$in->ask_from('Scannerdrake',
@@ -223,10 +227,6 @@ sub tryConfScanner {
 	}
     }
     ($vendor, $product) = scanner::get_usb_ids_for_port($port);
-    if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj)/i) {
-     	$in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", removeverticalbar($model)));
-     	return 0;
-    }
     scanner::confScanner($model, $port, $vendor, $product);
     $in->ask_warn(N("Congratulations!"),
 		  N("Your %s has been configured.\nYou may now scan documents using \"XSane\" from Multimedia/Graphics in the applications menu.", removeverticalbar($model)));
-- 
cgit v1.2.1