Index: feedapi_mapper.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/Attic/feedapi_mapper.admin.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 feedapi_mapper.admin.inc
--- feedapi_mapper.admin.inc	13 Aug 2009 23:54:55 -0000	1.1.2.6
+++ feedapi_mapper.admin.inc	14 Aug 2009 16:16:11 -0000
@@ -112,6 +112,10 @@ function feedapi_mapper_delete_form($for
  */
 function feedapi_mapper_delete_form_submit($form, &$form_state) {
   $param = isset($form['#node']->nid) && _feedapi_mapper_is_overridden($form['#node']->nid) ? $form['#node']->nid : $form['#node']->type;
+  $node = new stdClass();
+  $field = is_numeric($param) ? 'nid' : 'type';
+  $node->{$field} = $param;
+  feedapi_mapper_override_mapping($node);
   feedapi_mapper_delete_mapping($param, $form['#source']);
   drupal_set_message(t('The mapping entry has been deleted successfully'));
 }
@@ -162,7 +166,7 @@ function feedapi_mapper_toggle_unique($p
     $path = "node/{$node->nid}/map";
     $param = $node->nid;
   }
-  $mapping = feedapi_mapper_load_mapping($node);
+  $mapping = feedapi_mapper_override_mapping($node);
   feedapi_mapper_delete_mapping($param, $key);
   feedapi_mapper_add_mapping($param, $key, $mapping['mapping'][$key], !$mapping['unique'][$key]);
   drupal_goto($path);
Index: feedapi_mapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi_mapper/feedapi_mapper.module,v
retrieving revision 1.2.2.19
diff -u -p -r1.2.2.19 feedapi_mapper.module
--- feedapi_mapper.module	12 Aug 2009 22:07:24 -0000	1.2.2.19
+++ feedapi_mapper.module	14 Aug 2009 16:16:11 -0000
@@ -371,6 +371,25 @@ function feedapi_mapper_delete_mapping($
 }
 
 /**
+ * Overrides the mapping with the exported mapping if the current is exported.
+ * Acts like _feedapi_mapper_load($param) otherwise.
+ *
+ * @param
+ *   Either a node id of a node type.
+ * @return
+ *   The (new) valid mapping for $param
+ */
+function feedapi_mapper_override_mapping($node) {
+  $mapping = feedapi_mapper_load_mapping($node);
+  if ($mapping) {
+    if ($mapping['export_type'] === EXPORT_IN_CODE) {
+      feedapi_mapper_save_mapping(isset($node->nid) ? $node->nid : $node->type, $mapping);
+    }
+    return $mapping;
+  }
+}
+
+/**
  * Helper function - determines content type of feed _item_.
  */
 function feedapi_mapper_get_item_node_type($feed_node) {