2 files changed, 14 insertions, 5 deletions

diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 74b01ef27..49cba826f 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -547,7 +547,7 @@ public:
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
         mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
 
-        updateList();
+        getPlayersAvatars();
         setCaption(name);
     }
 
@@ -881,7 +881,7 @@ public:
 
         const Map *const map = socialWindow->getMap();
         if (!map)
-            return 01;
+            return -1;
 
         std::vector<Avatar*>::const_iterator i = avatars->begin();
         const std::vector<Avatar*>::const_iterator i_end = avatars->end();
@@ -1021,7 +1021,7 @@ private:
         ++ ia;\
     }\
     avatars->clear();\
-    Avatar *ava;\
+    Avatar *ava = nullptr;\
     std::list<std::string> mobs;\
     std::list<std::string>::const_iterator i;\
     std::list<std::string>::const_iterator i_end;
@@ -1135,7 +1135,7 @@ public:
         mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
         mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
 
-        updateList();
+        getPlayersAvatars();
         setCaption(name);
     }
 
@@ -1227,9 +1227,11 @@ public:
         mBrowserBox->addRow("##3---");
         // TRANSLATORS: party popup item
         mBrowserBox->addRow(strprintf("@@cancel|%s@@", _("Cancel")));
+    }
 
+    void postInit()
+    {
         add(mBrowserBox);
-
         setContentSize(mBrowserBox->getWidth() + 8,
                        mBrowserBox->getHeight() + 8);
     }
@@ -1304,6 +1306,11 @@ SocialWindow::SocialWindow() :
     mNeedUpdate(false),
     mProcessedPortals(false)
 {
+    mCreatePopup->postInit();
+}
+
+void SocialWindow::postInit()
+{
     setWindowName("Social");
     setVisible(false);
     setSaveVisible(true);
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index c1833cd0a..28b139589 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -54,6 +54,8 @@ public:
 
     ~SocialWindow();
 
+    void postInit();
+
     bool addTab(Guild *const guild);
 
     bool removeTab(Guild *const guild);