Fix circle settings crash regression

src/friend.h

@@ -25,7 +25,7 @@
 #include "src/core/corestructs.h"
 #include "core/toxid.h"
 
-struct FriendWidget;
+class FriendWidget;
 class ChatForm;
 
 class Friend : public QObject

src/persistence/settings.h

@@ -368,7 +368,7 @@ private:
         QString alias;
         QString addr;
         QString autoAcceptDir;
-        int circleIndex;
+        int circleIndex = -1;
     };
 
     struct circleProp

src/widget/friendlistwidget.cpp

@@ -60,14 +60,11 @@ void FriendListWidget::addGroupWidget(GroupWidget *widget)
 
 void FriendListWidget::addFriendWidget(FriendWidget *w, Status s, int circleIndex)
 {
-    if (circleIndex == -1)
+    CircleWidget* circleWidget = CircleWidget::getFromID(circleIndex);
+    if (circleWidget == nullptr)
         moveWidget(w, s, true);
     else
-    {
-        CircleWidget::getFromID(circleIndex)->addFriendWidget(w, s);
-        CircleWidget::getFromID(circleIndex)->show();
-        //w->setParent(CircleWidget::getFromID(circleIndex));
-    }
+        circleWidget->addFriendWidget(w, s);
 }
 
 void FriendListWidget::addCircleWidget(int id)

src/widget/friendwidget.h

@@ -27,7 +27,7 @@
 class QPixmap;
 class MaskablePixmapWidget;
 
-struct FriendWidget final : public GenericChatroomWidget
+class FriendWidget : public GenericChatroomWidget
 {
     Q_OBJECT
 public:
@@ -51,8 +51,8 @@ public slots:
     void setAlias(const QString& alias);
 
 protected:
-    virtual void mousePressEvent(QMouseEvent* ev) final override;
-    virtual void mouseMoveEvent(QMouseEvent* ev) final  override;
+    virtual void mousePressEvent(QMouseEvent* ev) override;
+    virtual void mouseMoveEvent(QMouseEvent* ev) override;
     void setFriendAlias();
     void showEvent(QShowEvent *)
     {