Index: ctm.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctm/ctm.module,v
retrieving revision 1.1
diff -u -F^f -r1.1 ctm.module
--- ctm.module  24 Nov 2008 13:04:15 -0000      1.1
+++ ctm.module  7 Mar 2009 08:00:56 -0000
@@ -34,10 +34,6 @@ function ctm_form_alter(&$form, $form_st
            unset($form['menu']);
     }
   }
-  // Delete Content Type
-  elseif ($form_id == 'node_type_delete_confirm') {
-    $form['#submit'][] = 'ctm_node_type_delete_confirm';
-  }
 }

 /**
@@ -53,8 +49,22 @@ function ctm_node_type_form_submit(&$for
 }

 /**
- *  Delete Content Type Form Submit - Delete Menu Settings Variable.
+ * Implementation of hook_node_type().
  */
-function ctm_node_type_delete_confirm(&$form, $form_state) {
-  variable_del($form_state['values']['type'].'_menu_settings');
+function ctm_node_type($op, $info) {
+  switch ($op) {
+    case 'delete':
+      variable_del($info->type . '_menu_settings');
+      break;
+
+    case 'update':
+      if (!empty($info->old_type) && $info->old_type != $info->type) {
+        $menu_settings = variable_get($info->old_type . '_menu_settings', array());
+        variable_del($info->old_type . '_menu_settings');
+        if (!empty($menu_settings)) {
+          variable_set($info->type . '_menu_settings', $menu_settings);
+        }
+      }
+      break;
+  }
 }