11 files changed, 21 insertions, 9 deletions
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index fcfd0bfd3..4ab2c690c 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -170,6 +170,7 @@ void ChangeEmailDialog::action(const ActionEvent &event)
                 ShowCenter_true,
                 nullptr,
                 260);
+            dlg->postInit();
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index 3fae963ed..ed6ac578b 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -160,6 +160,7 @@ void ChangePasswordDialog::action(const ActionEvent &event)
                 ShowCenter_true,
                 nullptr,
                 260);
+            dlg->postInit();
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 4b10d5cf3..d6bc01e95 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -373,7 +373,7 @@ void CharCreateDialog::action(const ActionEvent &event)
         else
         {
             // TRANSLATORS: char creation error
-            new OkDialog(_("Error"),
+            (new OkDialog(_("Error"),
                 // TRANSLATORS: char creation error
                 _("Your name needs to be at least 4 characters."),
                 // TRANSLATORS: ok dialog button
@@ -382,7 +382,7 @@ void CharCreateDialog::action(const ActionEvent &event)
                 Modal_true,
                 ShowCenter_true,
                 nullptr,
-                260);
+                260))->postInit();;
         }
     }
     else if (id == "cancel")
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 9b03528ec..c6e040065 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -276,14 +276,14 @@ void CharSelectDialog::action(const ActionEvent &event)
                 character->data.mAttributes[Attributes::EXP]),
                 Units::formatCurrency(
                 character->data.mAttributes[Attributes::MONEY]).c_str());
-            new OkDialog(data->getName(), msg,
+            (new OkDialog(data->getName(), msg,
                 // TRANSLATORS: ok dialog button
                 _("OK"),
                 DialogType::SILENCE,
                 Modal_true,
                 ShowCenter_true,
                 nullptr,
-                260);
+                260))->postInit();
         }
     }
     if (eventId == "switch")
@@ -321,14 +321,14 @@ void CharSelectDialog::action(const ActionEvent &event)
             else
             {
                 // TRANSLATORS: error message
-                new OkDialog(_("Error"), _("Incorrect password"),
+                (new OkDialog(_("Error"), _("Incorrect password"),
                     // TRANSLATORS: ok dialog button
                     _("OK"),
                     DialogType::ERROR,
                     Modal_true,
                     ShowCenter_true,
                     nullptr,
-                    260);
+                    260))->postInit();
             }
         }
         mDeleteIndex = -1;
@@ -346,6 +346,7 @@ void CharSelectDialog::use(const int selected)
     {
         CharCreateDialog *const charCreateDialog =
             new CharCreateDialog(this, selected);
+        charCreateDialog->postInit();
         mCharServerHandler->setCharCreateDialog(charCreateDialog);
     }
 }
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 5444f2107..5f22a5389 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -221,6 +221,7 @@ void EditServerDialog::action(const ActionEvent &event)
                 ShowCenter_true,
                 nullptr,
                 260);
+            dlg->postInit();
             dlg->addActionListener(this);
         }
         else
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index 1fc38c2a9..023ea925a 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -183,6 +183,7 @@ void MailViewWindow::action(const ActionEvent &event)
         if (mailEditWindow)
             mailEditWindow->scheduleDelete();
         mailEditWindow = new MailEditWindow;
+        mailEditWindow->postInit();
         mailEditWindow->setTo(mMessage->sender);
         mailEditWindow->setSubject("Re:" + mMessage->title);
         mailEditWindow->setMessage(">" + mMessage->text);
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index 18d0626d1..e1edbb74b 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -120,7 +120,10 @@ void MailWindow::action(const ActionEvent &event)
     else if (eventId == "new")
     {
         if (!mailEditWindow)
+        {
             mailEditWindow = new MailEditWindow;
+            mailEditWindow->postInit();
+        }
     }
     else if (eventId == "open")
     {
@@ -213,6 +216,7 @@ void MailWindow::showMessage(MailMessage *const mail)
     }
     delete mailViewWindow;
     mailViewWindow = new MailViewWindow(mail);
+    mailViewWindow->postInit();
 }
 
 void MailWindow::viewNext(const int id)
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index e7d9425e1..021ebb938 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -247,6 +247,7 @@ void RegisterDialog::action(const ActionEvent &event)
                 ShowCenter_true,
                 nullptr,
                 260);
+            dlg->postInit();
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index d9e182757..b173da568 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -370,7 +370,7 @@ void ShopWindow::action(const ActionEvent &event)
     {
         EditDialog *const dialog = new EditDialog(
             _("Please enter new shop name"), mSellShopName, "OK");
-            dialog->postInit();
+        dialog->postInit();
         shopRenameListener.setDialog(dialog);
         dialog->addActionListener(&shopRenameListener);
     }
@@ -812,6 +812,7 @@ void ShopWindow::showList(const std::string &nick, std::string data)
     {
         data = data.substr(2);
         buyDialog = new BuyDialog(nick);
+        buyDialog->postInit();
     }
     else if (data.find("S1") == 0)
     {
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 4a32e75a9..83935ed49 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -502,7 +502,7 @@ void SocialWindow::showPartyCreate()
     if (localPlayer->getParty())
     {
         // TRANSLATORS: party creation message
-        new OkDialog(_("Create Party"),
+        (new OkDialog(_("Create Party"),
             _("Cannot create party. You are already in a party"),
             // TRANSLATORS: ok dialog button
             _("OK"),
@@ -510,7 +510,7 @@ void SocialWindow::showPartyCreate()
             Modal_true,
             ShowCenter_true,
             this,
-            260);
+            260))->postInit();
         return;
     }
 
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index 91975510b..c8ec421a5 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -150,6 +150,7 @@ void UnRegisterDialog::action(const ActionEvent &event)
                 ShowCenter_true,
                 nullptr,
                 260);
+            dlg->postInit();
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else