From d938cd0659d6187c829c89cc58a4130fc7241d2f Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Fri, 21 Sep 2001 19:48:40 +0000
Subject: When one changes the driver of a freshly added printer, the cursor
 was not pointed to the old driver, fixed. Fixed paper size not set according
 to chosen language during installation.

---
 perl-install/printer.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index d7b0f5674..e9ce0c908 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -1035,8 +1035,10 @@ sub configure_queue($) {
     }
 
     # Make a new printer entry in the $printer structure
-    $printer->{configured}{$printer->{currentqueue}{'queue'}}{'queuedata'}=
-	$printer->{currentqueue};
+    $printer->{configured}{$printer->{currentqueue}{'queue'}}{'queuedata'} =
+        {};
+    copy_printer_params($printer->{currentqueue},
+      $printer->{configured}{$printer->{currentqueue}{'queue'}}{'queuedata'});
     $printer->{configured}{$printer->{currentqueue}{'queue'}}{'args'} = {};
     if ($printer->{currentqueue}{foomatic}) {
 	my $tmp = $printer->{OLD_QUEUE};
@@ -1049,7 +1051,6 @@ sub configure_queue($) {
 	    read_cups_options($printer->{currentqueue}{'queue'});
     }
     # Clean up
-    delete($printer->{currentqueue});
     delete($printer->{ARGS});
     $printer->{OLD_CHOICE} = "";
     $printer->{ARGS} = {};
-- 
cgit v1.2.1