From be50d165b3033e2dd306b5d699fd79e957159e17 Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Mon, 18 Jul 2016 10:18:55 -0700
Subject: [PATCH] Fixed nil object error on Meals page

---
 app/controllers/conferences_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb
index 8df843a..7d3144a 100644
--- a/app/controllers/conferences_controller.rb
+++ b/app/controllers/conferences_controller.rb
@@ -804,7 +804,7 @@ class ConferencesController < ApplicationController
 				@time = nil
 				@length = 1.5
 			when :meals
-				@meals = Hash[@this_conference.meals.map{ |k, v| [k.to_i, v] }].sort.to_h
+				@meals = Hash[(@this_conference.meals || {}).map{ |k, v| [k.to_i, v] }].sort.to_h
 			when :workshop_times
 				get_block_data
 				@workshop_blocks << {