--- deliantra/Deliantra-Client/DC/Macro.pm	2006/12/09 23:06:39	1.5
+++ deliantra/Deliantra-Client/DC/Macro.pm	2007/07/20 16:32:04	1.7
@@ -271,9 +271,8 @@
             $recording = $::CONN && !$recording;
             if ($recording) {
                $widget->set_text ("Stop Recording");
-               my $action = $macro->{action} ||= [];
                $::CONN->record (sub {
-                  push @$action, $_[0];
+                  push @{ $macro->{action} }, $_[0];
                   $textedit->set_text (macro_to_text $macro);
                }) if $::CONN;
             } else {
@@ -299,12 +298,12 @@
    $REFRESH_MACRO_LIST = $refresh = sub {
       $macrolist->clear;
 
-      $macrolist->add (0, 1, new CFPlus::UI::Label
+      $macrolist->add_at (0, 1, new CFPlus::UI::Label
          text    => "Trigger",
          align   => 0,
          tooltip => $tooltip_trigger . $tooltip_common,
       );
-      $macrolist->add (1, 1, new CFPlus::UI::Label
+      $macrolist->add_at (1, 1, new CFPlus::UI::Label
          text    => "Commands",
          tooltip => $tooltip_commands . $tooltip_common,
       );
@@ -339,7 +338,7 @@
             1
          };
 
-         $macrolist->add (0, $y, new CFPlus::UI::Label
+         $macrolist->add_at (0, $y, new CFPlus::UI::Label
             text       => trigger_to_string $macro,
             tooltip    => $tooltip_trigger . $tooltip_common,
             align      => 0,
@@ -348,7 +347,7 @@
             on_button_down => $macro_cb,
          );
 
-         $macrolist->add (1, $y, new CFPlus::UI::Label
+         $macrolist->add_at (1, $y, new CFPlus::UI::Label
             text       => (join "; ", @{ $macro->{action} || [] }),
             tooltip    => $tooltip_commands . $tooltip_common,
             expand     => 1,