# HG changeset patch
# User unc0rr
# Date 1224174587 0
# Node ID 2ffe20744a4a93ff6c2a1426fae7207a9ab21ad4
# Parent 64c4922a6960eed2cb9fce4f44c6db349a0bf4fa
- Fix crash when changing maps
- Fix message not sent when switching to generated map
diff -r 64c4922a6960 -r 2ffe20744a4a QTfrontend/mapContainer.cpp
--- a/QTfrontend/mapContainer.cpp Wed Oct 15 19:32:10 2008 +0000
+++ b/QTfrontend/mapContainer.cpp Thu Oct 16 16:29:47 2008 +0000
@@ -58,7 +58,7 @@
chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
chooseMap->addItem(QComboBox::tr("generated map..."));
chooseMap->addItems(*mapList);
- connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int)));
+ connect(chooseMap, SIGNAL(currentIndexChanged(int)), this, SLOT(mapChanged(int)));
mainLayout.addWidget(chooseMap, 1, 1);
QLabel * lblMap = new QLabel(tr("Map"), this);
@@ -200,7 +200,10 @@
chooseMap->setCurrentIndex(id);
loadMap(id);
if (pMap)
+ {
disconnect(pMap, 0, this, SLOT(setImage(const QImage)));
+ pMap = 0;
+ }
}
}
diff -r 64c4922a6960 -r 2ffe20744a4a hedgewars.kdevelop
--- a/hedgewars.kdevelop Wed Oct 15 19:32:10 2008 +0000
+++ b/hedgewars.kdevelop Thu Oct 16 16:29:47 2008 +0000
@@ -48,6 +48,7 @@
*.pas
*.inc
*.dpr
+ *.hs
@@ -213,7 +214,7 @@
false
-
+
true
false