Finish merging registration dialog

1 files changed, 9 insertions, 3 deletions

diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index eb05e25e..62d2a3f7 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -39,10 +39,11 @@
 #include <string>
 #include <sstream>
 
+std::string *ChangeEmailDialog::emailPointer = NULL;
+
 ChangeEmailDialog::ChangeEmailDialog(Window *parent, LoginData *loginData):
     Window(_("Change Email Address"), true, parent),
-    mWrongDataNoticeListener(new WrongDataNoticeListener),
-    mLoginData(loginData)
+    mWrongDataNoticeListener(new WrongDataNoticeListener)
 {
     gcn::Label *accountLabel = new Label(strprintf(_("Account: %s"),
                                                    mLoginData->username.c_str()));
@@ -159,10 +160,15 @@ ChangeEmailDialog::action(const gcn::ActionEvent &event)
             // No errors detected, change account password.
             mChangeEmailButton->setEnabled(false);
             // Set the new email address
-            mLoginData->newEmail = newFirstEmail;
+            *emailPointer = newFirstEmail;
             state = STATE_CHANGEEMAIL_ATTEMPT;
             scheduleDelete();
         }
 
     }
 }
+
+void ChangeEmailDialog::setEmail(std::string *email)
+{
+    emailPointer = email;
+}