From 575ed822b4735e4385c0edb7862dcb595ed8a0b9 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 19 Jul 2014 15:46:06 -0700
Subject: [PATCH] Set shouldExpectKey after finishing radius; clean up asserts
 in ObjectParser

---
 src/yaml/objectParser.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/yaml/objectParser.cc b/src/yaml/objectParser.cc
index 9615ca2..d5efd71 100644
--- a/src/yaml/objectParser.cc
+++ b/src/yaml/objectParser.cc
@@ -76,6 +76,7 @@ void
 ObjectParser::HandleColorEvent(yaml_event_t& event)
 {
     if (event.type != YAML_SEQUENCE_START_EVENT) {
+        /* TODO: Clean this up. */
         assert(event.type != YAML_SEQUENCE_START_EVENT);
         return;
     }
@@ -102,7 +103,8 @@ ObjectParser::HandleOriginEvent(yaml_event_t& event)
 {
     if (event.type != YAML_SEQUENCE_START_EVENT) {
         /* TODO: Clean this up. */
-        assert(false);
+        assert(event.type != YAML_SEQUENCE_START_EVENT);
+        return;
     }
 
     auto onDone = [this](std::vector<double> origin) {
@@ -136,6 +138,7 @@ ObjectParser::HandleRadiusEvent(yaml_event_t& event)
     }
     mObject->set_radius(radius);
     mSection = NoSection;
+    SetShouldExpectKey(true);
 }
 
 } /* namespace yaml */