Ticket #4596: 4596_diff.patch

mythplugins/mythweather/mythweather/weatherSetup.cpp

@@ -510 +510 @@
             si = new ScreenListInfo;
             si->units = units;
             si->types.setAutoDelete(true);
-            si->types.insert(dataitem, ti);
+
+            // Only insert types meant for this container
+            for (QStringList::Iterator type_i = types.begin(); type_i != types.end(); ++type_i )
+            {
+                if(*type_i == dataitem)
+                {
+                    si->types.insert(dataitem, ti);
+                }
+            }
+
             si->hasUnits = !(bool) set->GetType("nounits");
             si->multiLoc = (bool) set->GetType("multilocation");
             itm->setData(si);
@@ -519 +528 @@
         else
         {
             si = active_screens[draworder];
-            si->types.insert(dataitem, ti);
+            for (QStringList::Iterator type_i = types.begin(); type_i != types.end(); ++type_i )
+            {
+                if(*type_i == dataitem)
+                {
+                    si->types.insert(dataitem, ti);
+                }
+            }
         }
     }
 }