Merge pull request #522 from dseliskar/develop

Fix for TemplateFileStream Typo fix for eSST_TemplateFile
SmingHub · Jan 2, 2016 · f3459ac · f3459ac
2 parents dfb3b43 + 805e23c
commit f3459ac
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Sming/SmingCore/DataSourceStream.cpp b/Sming/SmingCore/DataSourceStream.cpp
@@ -223,10 +223,12 @@ uint16_t TemplateFileStream::readMemoryBlock(char* data, int bufSize)
 					memcpy(varname, cur + 1, p - cur - 1); // name without { and }
 					varName = varname;
 					state = eTES_Found;
-					varWaitSize = cur - tpl;
-					debugf("found var: %s, at %d (%d) - %d, send size %d", varName.c_str(), cur - tpl + 1, cur - tpl + getPos(), p - tpl, cur - tpl);
+					int sz = cur - tpl;
+					varWaitSize = sz;
+					debugf("found var: %s, at %d (%d) - %d, send size %d", varName.c_str(), sz + 1, sz + getPos(), p - tpl, sz);
 					skipBlockSize = block;
-					return cur - tpl; // return only plain text from template without our variable
+					if (sz == 0) state = eTES_StartVar;
+					return sz; // return only plain text from template without our variable
 				}
 			}
 			cur = (char*)memchr(p, '{', len - (p - tpl)); // continue searching..

diff --git a/Sming/SmingCore/DataSourceStream.h b/Sming/SmingCore/DataSourceStream.h
@@ -22,7 +22,7 @@ enum StreamType
 {
 	eSST_Memory,
 	eSST_File,
-	eSST_TepmplateFile,
+	eSST_TemplateFile,
 	eSST_JsonObject,
 	eSST_User,
 	eSST_Unknown
@@ -104,7 +104,7 @@ class TemplateFileStream : public FileStream
 	TemplateFileStream(String templateFileName);
 	virtual ~TemplateFileStream();
 
-	virtual StreamType getStreamType() { return eSST_TepmplateFile; }
+	virtual StreamType getStreamType() { return eSST_TemplateFile; }
 
 	virtual uint16_t readMemoryBlock(char* data, int bufSize);
 	virtual bool seek(int len);