fix: crash when startup.

royqh1979 · Dec 5, 2024 · b751edd · b751edd
1 parent b53742c
commit b751edd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/RedPandaIDE/widgets/codecompletionpopup.cpp b/RedPandaIDE/widgets/codecompletionpopup.cpp
@@ -32,8 +32,11 @@
 
 CodeCompletionPopup::CodeCompletionPopup(QWidget *parent) :
     QWidget(parent),
+    mListView(nullptr),
     mMutex()
 {
+    setWindowFlags(Qt::Popup);
+
     mListView = new CodeCompletionListView(this);
     mModel=new CodeCompletionListModel(&mCompletionStatementList);
     mDelegate = new CodeCompletionListItemDelegate(mModel,this);
@@ -57,9 +60,6 @@ CodeCompletionPopup::CodeCompletionPopup(QWidget *parent) :
 
     mHideSymbolsStartWithTwoUnderline = false;
     mHideSymbolsStartWithUnderline = false;
-
-    // may trigger font change event, place it after member initialization
-    setWindowFlags(Qt::Popup);
 }
 
 CodeCompletionPopup::~CodeCompletionPopup()
@@ -1262,8 +1262,10 @@ bool CodeCompletionPopup::event(QEvent *event)
 {
     bool result = QWidget::event(event);
     if (event->type() == QEvent::FontChange) {
-        mListView->setFont(font());
-        mDelegate->setFont(font());
+        if (mListView) {
+            mListView->setFont(font());
+            mDelegate->setFont(font());
+        }
     }
     return result;
 }

diff --git a/RedPandaIDE/widgets/headercompletionpopup.cpp b/RedPandaIDE/widgets/headercompletionpopup.cpp
@@ -27,8 +27,11 @@
 #include "../colorscheme.h"
 #include <qsynedit/constants.h>
 
-HeaderCompletionPopup::HeaderCompletionPopup(QWidget* parent):QWidget(parent)
+HeaderCompletionPopup::HeaderCompletionPopup(QWidget* parent):QWidget{parent},
+    mListView{nullptr}
 {
+    setWindowFlags(Qt::Popup);
+
     mListView = new CodeCompletionListView(this);
     mModel=new HeaderCompletionListModel(&mCompletionList, 0);
     QItemSelectionModel *m=mListView->selectionModel();
@@ -46,9 +49,6 @@ HeaderCompletionPopup::HeaderCompletionPopup(QWidget* parent):QWidget(parent)
     mCurrentFile = "";
     mPhrase = "";
     mIgnoreCase = false;
-
-    // may trigger font change event, place it after member initialization
-    setWindowFlags(Qt::Popup);
 }
 
 HeaderCompletionPopup::~HeaderCompletionPopup()
@@ -320,13 +320,11 @@ void HeaderCompletionPopup::hideEvent(QHideEvent *)
 bool HeaderCompletionPopup::event(QEvent *event)
 {
     bool result = QWidget::event(event);
-    switch (event->type()) {
-    case QEvent::FontChange:
-        mListView->setFont(font());
-        mDelegate->setFont(font());
-        break;
-    default:
-        break;
+    if (event->type() == QEvent::FontChange) {
+        if (mListView) {
+            mListView->setFont(font());
+            mDelegate->setFont(font());
+        }
     }
     return result;
 }