From ffdc3468a135f0f2966e9eb6ccc61a73eb2790a0 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Fri, 5 Oct 2007 16:43:35 +0000
Subject: [PATCH] bugfix delete human player avatar when click cancel in
 selectavatardialog

---
 src/gui/qt/settingsdialog.ui                     | 2 +-
 src/gui/qt/settingsdialog/settingsdialogimpl.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 9262a488..269e56f1 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -2976,7 +2976,7 @@ p, li { white-space: pre-wrap; }
      </item>
      <item>
       <property name="text" >
-       <string>Player Nicks</string>
+       <string>Player Nicks/Avatars</string>
       </property>
      </item>
      <item>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index fef3b8f3..1920bfd7 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -388,10 +388,10 @@ void settingsDialogImpl::setFlipsidePicFileName()
 void settingsDialogImpl::setAvatarFile0() {
 
 	callSelectAvatarDialog();
-	pushButton_HumanPlayerAvatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
-	
-	pushButton_HumanPlayerAvatar->setIcon(QIcon(pushButton_HumanPlayerAvatar->getMyLink()));
-	
+	if(mySelectAvatarDialogImpl->getSettingsCorrect()) {
+		pushButton_HumanPlayerAvatar->setMyLink(mySelectAvatarDialogImpl->getAvatarLink());
+		pushButton_HumanPlayerAvatar->setIcon(QIcon(pushButton_HumanPlayerAvatar->getMyLink()));
+	}
 }
 
 void settingsDialogImpl::setAvatarFile1() {