Fixes.

2 files changed, 3 insertions, 3 deletions

diff --git a/Makefile.new b/Makefile.new
index f80b96c..4529f06 100755
--- a/Makefile.new
+++ b/Makefile.new
@@ -54,7 +54,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o smarttvfactory.o httpresource.o httpclient.o mngurls.o log.o url.o stvw_cfg.o responsebase.o responsefile.o responsevdrdir.o responsememblk.o responselive.o httpresource_base.o
+OBJS = $(PLUGIN).o smarttvfactory.o httpresource.o httpclient.o mngurls.o log.o url.o stvw_cfg.o responsebase.o responsefile.o responsevdrdir.o responsememblk.o responselive.o httpresource_base.o mp4.o
 
 ### The main target:
 
diff --git a/responsememblk.c b/responsememblk.c
index 92e1bc2..3cda494 100755
--- a/responsememblk.c
+++ b/responsememblk.c
@@ -1822,7 +1822,7 @@ int cResponseMemBlk::parseFiles(vector<sFileEntry> *entries, string prefix, stri
 					  ((meta.mCreationTime != 0) ? meta.mCreationTime : statbuf->st_mtime), 
 					  mime, 
 					  (meta.mHaveTitle) ? meta.mTitle : prefix+de->d_name, 
-					  meta.mShortDesc, meta.mLongDesc, meta.mDuration));
+					  meta.mShortDesc, (meta.mHaveLongDesc) ? meta.mLongDesc : meta.mShortDesc, meta.mDuration));
 	}
 	else
 	  entries->push_back(sFileEntry(prefix+de->d_name, pathbuf, statbuf->st_mtime, mime));
@@ -1878,7 +1878,7 @@ int cResponseMemBlk::sendMediaXml (struct stat *statbuf) {
     	     cUrlEncode::doUrlSaveEncode(entries[i].sPath).c_str());
     if (entries[i].sHaveMeta) {
       if (writeXmlItem(cUrlEncode::doXmlSaveEncode(entries[i].sTitle), pathbuf, 
-		       cUrlEncode::doXmlSaveEncode(entries[i].sLongDesc), "NA", 
+		       "NA", cUrlEncode::doXmlSaveEncode(entries[i].sLongDesc),  
 		       cUrlEncode::doUrlSaveEncode(entries[i].sPath).c_str(), 
 		       -1, entries[i].sStart, entries[i].sDuration, -1, -1, -1, entries[i].sMime) == ERROR) 
 	return ERROR;