--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 03:33:51	1.11
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/24 11:54:26	1.14
@@ -1,6 +1,7 @@
 package CFClient::MapWidget;
 
 use strict;
+use utf8;
 
 use List::Util qw(min max);
 
@@ -216,6 +217,8 @@
 
    if ($sym == CFClient::SDLK_KP5) {
       $::CONN->user_send ("stay fire");
+   } elsif ($sym == ord ",") {
+      $::CONN->user_send ("take");
    } elsif ($sym == ord "a") {
       $::CONN->user_send ("apply");
    } elsif ($sym == ord "'") {
@@ -247,6 +250,7 @@
             },
       ;
       $self->{command_widget}->key_down ($ev);
+      return unless $self->{command_widget};
       $self->{command_widget}->show;
       $self->{command_widget}->focus_in;
    }
@@ -355,6 +359,7 @@
       }
    } elsif ($ev->{sym} == 27) {
       $self->emit ("close");
+      return;
    } elsif ((chr $ev->{unicode}) =~ /^[[:alpha:]]$/) {
       $self->{search} .= chr $ev->{unicode};
       $self->update_labels;