Fix crash in Login with empty name.

3 files changed, 9 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 5c0ba589..655cd4b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-01  Björn Steinbrink  <B.Steinbrink@gmx.de>
+
+	* src/gui/login.cpp, src/gui/login.h: Remove tracking of OkDialog, the
+	garbage collection stuff takes care of deletion and breaks manual
+	tracking.
+
 2006-01-01  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* src/main.cpp: Applied patch by pclouds that allows for a faster
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index ad469d22..722911ca 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -61,7 +61,6 @@ WrongDataNoticeListener::action(const std::string &eventId)
         target->setText("");
         target->setCaretPosition(0);
         target->requestFocus();
-        //wrongLoginNotice = NULL;
     }
 }
 
@@ -143,15 +142,10 @@ LoginDialog::LoginDialog():
     serverField->setText(config.getValue("host", ""));
 
     wrongDataNoticeListener = NULL;
-    wrongLoginNotice = NULL;
 }
 
 LoginDialog::~LoginDialog()
 {
-    if (wrongLoginNotice)
-    {
-        delete wrongLoginNotice;
-    }
 }
 
 void
@@ -180,12 +174,7 @@ LoginDialog::action(const std::string& eventId)
         {
             wrongDataNoticeListener = new WrongDataNoticeListener();
             wrongDataNoticeListener->setTarget(this->passField);
-            if (wrongLoginNotice)
-            {
-                delete wrongLoginNotice;
-            }
-            wrongLoginNotice = new OkDialog("Error",
-                     "Enter your username first",
+            new OkDialog("Error", "Enter your username first",
                      wrongDataNoticeListener);
         }
         else
diff --git a/src/gui/login.h b/src/gui/login.h
index ca50df96..52ec27b1 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -90,12 +90,11 @@ class LoginDialog : public Window, public gcn::ActionListener {
         gcn::Button *registerButton;
         int mStatus;
         bool registration;
-        
+
         void attemptLogin(const std::string& user, const std::string& pass);
         void checkLogin();
-        
+
         WrongDataNoticeListener *wrongDataNoticeListener;
-        OkDialog *wrongLoginNotice;
 };
 
 /**