From c0c5c72e32f02c1aced21a40757e1dc69b8c9ab3 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Mon, 7 Sep 2015 03:30:31 -0500
Subject: [PATCH] Fixed MemFs constructor to try to init without an Error
 pointer passed in.

---
 src/memphis/memfs.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/memphis/memfs.cpp b/src/memphis/memfs.cpp
index 84c723f2c..61bbbc018 100644
--- a/src/memphis/memfs.cpp
+++ b/src/memphis/memfs.cpp
@@ -38,18 +38,20 @@ void MemFs::Record::setData(uint8_t *data, int size) {
 // MemFs
 
 MemFs::MemFs(uint8_t *begin, uint8_t *end, Error *error): m_version(*((uint32_t*) begin)), m_lastRec(*(MemFsPtr*) (begin + sizeof(m_version))) {
-	if (error) {
-		if (version != m_version) {
-			// version mismatch
+	if (version != m_version) {
+		// version mismatch
+		if (error) {
 			*error = 1;
-		} else {
-			// ok
+		}
+	} else {
+		// ok
+		m_begin = begin;
+		m_end = end;
+		m_root = (Record*) (begin + sizeof(MemFsPtr));
+		if (error) {
 			*error = 0;
 		}
 	}
-	m_begin = begin;
-	m_end = end;
-	m_root = (Record*) (begin + sizeof(MemFsPtr));
 }
 
 void MemFs::init() {