diff -r dd3cf0c91cc9 -r 79fe4266b2ca QTfrontend/ui/widget/mapContainer.cpp --- a/QTfrontend/ui/widget/mapContainer.cpp Sat Nov 01 11:20:37 2014 -0400 +++ b/QTfrontend/ui/widget/mapContainer.cpp Mon Nov 03 07:22:21 2014 -0500 @@ -554,19 +554,24 @@ { mapgen = m; + bool f = false; switch (m) { case MAPGEN_REGULAR: m_mapInfo.type = MapModel::GeneratedMap; + f = true; break; case MAPGEN_MAZE: m_mapInfo.type = MapModel::GeneratedMaze; + f = true; break; case MAPGEN_PERLIN: m_mapInfo.type = MapModel::GeneratedPerlin; + f = true; break; case MAPGEN_DRAWN: m_mapInfo.type = MapModel::HandDrawnMap; + f = true; break; case MAPGEN_MAP: switch (m_mapInfo.type) @@ -582,7 +587,8 @@ break; } - emit mapgenChanged(m); + if(f) + changeMapType(m_mapInfo.type, QModelIndex()); } } @@ -883,11 +889,8 @@ mapList->scrollTo(map); } - if (map.data(Qt::UserRole + 1).canConvert()) - setMapInfo(map.data(Qt::UserRole + 1).value()); - else - Q_ASSERT(false); // Houston, we have a problem. - + Q_ASSERT(map.data(Qt::UserRole + 1).canConvert()); // Houston, we have a problem. + setMapInfo(map.data(Qt::UserRole + 1).value()); } void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo)