Fixed bug in 'set standard settings' after moving code out (global variables not...

diff --git a/soft/toolbox/jtag_atomic/the_gui.pl b/soft/toolbox/jtag_atomic/the_gui.pl
index 1026a58e6ce3665701e0b471517507afb5c48382..de329df0ced38f899cbe3d97da5dee8fe6df1119 100755 (executable)
--- a/soft/toolbox/jtag_atomic/the_gui.pl
+++ b/soft/toolbox/jtag_atomic/the_gui.pl
@@ -259,7 +259,7 @@ sub h_reload_boardsini {
 
                               );
     $boards_handlers{$board} = \%board_handlers;
-    $board_handlers{'h_set_standard'}  = generate_h_set_standard(\%boards_handlers, \%chains_handlers);
+    $board_handlers{'h_set_standard'}  = generate_h_set_standard(\%boards_handlers, \%chains_handlers, \%chain_defaults, \%board_defaults, \%chain_defaults2);
     $boards_handlers{$board} = \%board_handlers;
     $gladexml3->signal_autoconnect_all(%board_handlers);
     my $vbox_board = $gladexml3->get_widget('vbox_top');

diff --git a/soft/toolbox/jtag_atomic/ui_generators.pl b/soft/toolbox/jtag_atomic/ui_generators.pl
index 026e7c137fd8c939d808c464aa826d4559b0727f..4605fe177b5e468a144b7c69795690f4477e29e8 100644 (file)
--- a/soft/toolbox/jtag_atomic/ui_generators.pl
+++ b/soft/toolbox/jtag_atomic/ui_generators.pl
@@ -344,6 +344,9 @@ sub generate_h_start_trbnetd {
 sub generate_h_set_standard {
   my %boards_handlers = %{$_[0]};
   my %chains_handlers = %{$_[1]};
+  my %chain_defaults  = %{$_[2]};
+  my %board_defaults  = %{$_[3]};
+  my %chain_defaults2  = %{$_[4]};
   return sub {
     foreach my $board (reverse sort keys %chains_handlers) {
       my %chains_handlers2 = %{$chains_handlers{$board}};