Index: i18nmenu.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18nmenu/i18nmenu.module,v
retrieving revision 1.2.2.18
diff -u -r1.2.2.18 i18nmenu.module
--- i18nmenu.module	24 Nov 2009 16:28:10 -0000	1.2.2.18
+++ i18nmenu.module	13 Feb 2010 20:34:19 -0000
@@ -320,6 +320,13 @@
   if (isset($form['type']) && isset($form['#node']) && $form['type']['#value'] .'_node_form' == $form_id) {
     $node = $form['#node'];
 
+    if (!empty($form['menu'])) {
+      // Set menu language to node language.
+      $form['menu']['language'] = array('#type' => 'value', '#value' => $node->language);
+      // Customized must be set to 1 to save language.
+      $form['menu']['customized'] = array('#type' => 'value', '#value' => 1);
+    }
+
     // Do nothing if the node already has a menu.
     if (!empty($node->menu['mlid'])) {
       return;
@@ -348,12 +355,6 @@
       $form['menu']['link_title']['#default_value'] = $tnode->menu['link_title'];
       $form['menu']['weight']['#default_value'] = $tnode->menu['weight'];
       $form['menu']['parent']['#default_value'] = $tnode->menu['menu_name'] .':'. $tnode->menu['plid'];
-
-      // Set menu language to node language.
-      $form['menu']['language'] = array('#type' => 'value', '#value' => $node->language);
-
-      // Customized must be set to 1 to save language.
-      $form['menu']['customized'] = array('#type' => 'value', '#value' => 1);
     }
   }
 }