Ticket #6782: weather_screens.patch

mythplugins/mythweather/mythweather/weatherSetup.cpp

@@ -264 +264 @@
 
     QStringList types;
 
-    ScreenListMap m_ScreenListMap = loadScreens();
+    ScreenListMap screenListMap = loadScreens();
 
-    ScreenListMap::const_iterator i = m_ScreenListMap.constBegin();
-    while (i != m_ScreenListMap.constEnd())
+    ScreenListMap::const_iterator i = screenListMap.constBegin();
+    while (i != screenListMap.constEnd())
     {
 
-        si = m_ScreenListMap[i.key()];
+        si = screenListMap[i.key()];
         types = si->dataTypes;
         si->units = ENG_UNITS;
 
@@ -329 +329 @@
         QString src = db.value(4).toString();
         uint draworder = db.value(5).toUInt();
 
-        si = m_ScreenListMap[name];
+        si = new ScreenListInfo(*screenListMap[name]);
+        
         // Clear types first as we will re-insert the values from the database
         si->types.clear();
         types = si->dataTypes;

mythplugins/mythweather/mythweather/weatherUtils.h

@@ -51 +51 @@
 class ScreenListInfo
 {
   public:
+        ScreenListInfo() {}
+    ScreenListInfo(const ScreenListInfo &info)
+        : name(info.name), types(info.types), dataTypes(info.dataTypes),
+        helptxt(info.helptxt), sources(info.sources), units(info.units),
+        hasUnits(info.hasUnits), multiLoc(info.multiLoc) {}
+        
     TypeListInfo GetCurrentTypeList(void) const;
 
   public: