# HG changeset patch
# User Medo <smaxein@googlemail.com>
# Date 1345290021 -7200
# Node ID 5f0b1829b16f6813de50f8cd38ed82bc8e65917f
# Parent  e7ab89ab86f6bfeafdab2c08f082cc7187e22a66# Parent  9cfe74ee418be6ee5343c39fbb51d2b86066d9f4
Merge

diff -r e7ab89ab86f6 -r 5f0b1829b16f QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Sat Aug 18 13:39:24 2012 +0200
+++ b/QTfrontend/hwform.cpp	Sat Aug 18 13:40:21 2012 +0200
@@ -203,7 +203,7 @@
 
     connect(ui.pageFeedback->BtnSend, SIGNAL(clicked()), this, SLOT(SendFeedback()));
 
-    connect(ui.pageEditTeam, SIGNAL(teamEdited()), this, SLOT(AfterTeamEdit()));
+    connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit()));
 
     connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
     connect(ui.pageMultiplayer->teamsSelect, SIGNAL(setEnabledGameStart(bool)),
@@ -878,7 +878,7 @@
 void HWForm::AfterTeamEdit()
 {
     UpdateTeamsLists();
-    GoBack();
+    //GoBack();
 }
 
 
diff -r e7ab89ab86f6 -r 5f0b1829b16f QTfrontend/ui/page/pageeditteam.cpp
--- a/QTfrontend/ui/page/pageeditteam.cpp	Sat Aug 18 13:39:24 2012 +0200
+++ b/QTfrontend/ui/page/pageeditteam.cpp	Sat Aug 18 13:40:21 2012 +0200
@@ -472,5 +472,4 @@
 void PageEditTeam::saveTeam()
 {
     data().saveToFile();
-    emit teamEdited();
 }
diff -r e7ab89ab86f6 -r 5f0b1829b16f QTfrontend/ui/page/pageeditteam.h
--- a/QTfrontend/ui/page/pageeditteam.h	Sat Aug 18 13:39:24 2012 +0200
+++ b/QTfrontend/ui/page/pageeditteam.h	Sat Aug 18 13:40:21 2012 +0200
@@ -40,9 +40,6 @@
         void editTeam(const QString & name, const QString & playerHash);
         void deleteTeam(const QString & name);
 
-    signals:
-        void teamEdited();
-
     public slots:
         void CBFort_activated(const QString & gravename);
 
diff -r e7ab89ab86f6 -r 5f0b1829b16f hedgewars/uLand.pas
--- a/hedgewars/uLand.pas	Sat Aug 18 13:39:24 2012 +0200
+++ b/hedgewars/uLand.pas	Sat Aug 18 13:40:21 2012 +0200
@@ -782,7 +782,9 @@
 
     LandBackSurface:= nil;
     digest:= '';
-
+    LAND_WIDTH:= 0;
+    LAND_HEIGHT:= 0;
+(*
     if (cReducedQuality and rqBlurryLand) = 0 then
         SetLength(LandPixels, LAND_HEIGHT, LAND_WIDTH)
     else
@@ -790,6 +792,7 @@
 
     SetLength(Land, LAND_HEIGHT, LAND_WIDTH);
     SetLength(LandDirty, (LAND_HEIGHT div 32), (LAND_WIDTH div 32));
+*)
 end;
 
 procedure freeModule;