about summary refs log tree commit diff stats
path: root/031merge.cc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-06-17 17:22:15 -0700
committerKartik K. Agaram <vc@akkartik.com>2016-06-17 17:22:15 -0700
commit5c0e5492e9d067f9a535186e00c083be328d4d1b (patch)
tree8afaf347f4aa9dc70f516b72294d6aac79b35673 /031merge.cc
parent3c163ef7bd53a0bd22e3376a5472622633b88107 (diff)
downloadmu-5c0e5492e9d067f9a535186e00c083be328d4d1b.tar.gz
3061
Diffstat (limited to '031merge.cc')
-rw-r--r--031merge.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/031merge.cc b/031merge.cc
index c6e08027..034a62da 100644
--- a/031merge.cc
+++ b/031merge.cc
@@ -151,6 +151,7 @@ void check_merge_call(const vector<reagent>& ingredients, const reagent& product
       return;
     }
     reagent& container = state.data.top().container;
+    if (!container.type) return;  // error handled elsewhere
     type_info& container_info = get(Type, container.type->value);
     switch (container_info.kind) {
       case CONTAINER: {