1 files changed, 26 insertions, 23 deletions

diff --git a/update.c b/update.c
index 7b9da44..8113f97 100644
--- a/update.c
+++ b/update.c
@@ -1653,39 +1653,42 @@ cEvent* cUpdate::createEventFromRow(const cDbRow* row)
    // ------------
    // aux
 
-   useeventsDb->clear();
-   useeventsDb->setValue("USEID", row->getIntValue("USEID"));
-
-   if (selectEventById->find())
+   if (Epg2VdrConfig.extendedEpgData2Aux)
    {
-      cXml xml;
-
-      xml.create("epg2vdr");
+      useeventsDb->clear();
+      useeventsDb->setValue("USEID", row->getIntValue("USEID"));
 
-      for (int i = 0; auxFields[i]; i++)
+      if (selectEventById->find())
       {
-         cDbValue* value = useeventsDb->getValue(auxFields[i]);
+         cXml xml;
 
-         if (!value || value->isEmpty())
-            continue;
+         xml.create("epg2vdr");
 
-         if (value->getField()->hasFormat(cDBS::ffAscii) || value->getField()->hasFormat(cDBS::ffText) || value->getField()->hasFormat(cDBS::ffMText))
-            xml.appendElement(auxFields[i], value->getStrValue());
-         else
-            xml.appendElement(auxFields[i], value->getIntValue());
-      }
+         for (int i = 0; auxFields[i]; i++)
+         {
+            cDbValue* value = useeventsDb->getValue(auxFields[i]);
 
-      // finally add some fields of the view
+            if (!value || value->isEmpty())
+               continue;
 
-      xml.appendElement("source", viewMergeSource->getStrValue());
-      xml.appendElement("longdescription", viewLongDescription->getStrValue());
+            if (value->getField()->hasFormat(cDBS::ffAscii) || value->getField()->hasFormat(cDBS::ffText) || value->getField()->hasFormat(cDBS::ffMText))
+               xml.appendElement(auxFields[i], value->getStrValue());
+            else
+               xml.appendElement(auxFields[i], value->getIntValue());
+         }
 
-      // set to events aux field
+         // finally add some fields of the view
 
-      e->SetAux(xml.toText());
-   }
+         xml.appendElement("source", viewMergeSource->getStrValue());
+         xml.appendElement("longdescription", viewLongDescription->getStrValue());
+
+         // set to events aux field
 
-   selectEventById->freeResult();
+         e->SetAux(xml.toText());
+      }
+
+      selectEventById->freeResult();
+   }
 
 #endif // WITH_AUX_PATCH