From ee6604c44adc4125d47d5faa22741ac1e0486780 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Sat, 15 Sep 2001 00:05:09 +0000
Subject: Fixed bug of a waiting message appearing together with a dialog
 Cleaned up variables to correctly switch between CUPS/Foomatic/Raw type for a
 printer

---
 perl-install/printerdrake.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'perl-install/printerdrake.pm')

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 2e84e69ac..3741aed88 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -779,6 +779,9 @@ sub get_printer_info {
 	 (($oldchoice ne $printer->{DBENTRY}) ||
 	  ($printer->{currentqueue}{'driver'} ne 
 	   $printer::thedb{$printer->{DBENTRY}}{'driver'})))) {
+	delete($printer->{currentqueue}{printer});
+	delete($printer->{currentqueue}{ppd});
+	$printer->{currentqueue}{foomatic} = 0;
 	# Read info from printer database
 	foreach (qw(printer ppd driver make model)) { #- copy some parameter, shorter that way...
 	    $printer->{currentqueue}{$_} = $printer::thedb{$printer->{DBENTRY}}{$_};
@@ -1543,12 +1546,13 @@ sub main {
 	# only experts should be asked for the spooler
 	!$::expert and $printer->{SPOOLER} ||= 'cups';
 
-	# If we have chosen a spooler, install it.
-	if (($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '')) {
-	    if (!install_spooler($printer, $in)) {return;}
-	}
+    }
 
+    # If we have chosen a spooler, install it.
+    if (($printer->{SPOOLER}) && ($printer->{SPOOLER} ne '')) {
+	if (!install_spooler($printer, $in)) {return;}
     }
+
     # Control variables for the main loop
     my ($queue, $continue, $newqueue, $editqueue, $expertswitch) = ('', 1, 0, 0, 0);
     # Cursor position in queue modification window
-- 
cgit v1.2.1