Changeset 2698

Timestamp:

Oct 9, 2008, 11:50:39 PM (16 years ago)

Author:

ronosman

Message:

fix decode utf-8 exception when adding categories.

File:

• extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm (modified) (1 diff)

extras/pLoader/trunk/src/Uploader/GUI/wxFrameAUI.pm

@@ -545 +545 @@
   map {
       my $name = $_->[0];
-      $id = $tree->AppendItem( 
-                                  $parent_id, 
-                                  is_utf8($name) ? decode('UTF-8', $name) : $name,
-                                  defined($_->[3]) ? $_->[3] : 0, 
-                                  defined($_->[4]) ? $_->[4] : 0, 
-                                  itemData( $_->[2]) 
-                             );
+      eval {
+        $name = is_utf8($name) ?  decode('UTF-8', $name) : $name;
+      };
+      if($@){
+          $name = $_->[0];
+      }
+       $id = $tree->AppendItem( 
+                                   $parent_id, 
+                                   $name,
+                                   defined($_->[3]) ? $_->[3] : 0, 
+                                   defined($_->[4]) ? $_->[4] : 0, 
+                                   itemData( $_->[2]) 
+                              );
       $self->tree_item_default($id) if ! defined $self->tree_item_default;
       # current item has children