Skip to content

Commit ce73dd2

Browse files
committed
fix event editor tree widget loading
1 parent c0e3f53 commit ce73dd2

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

qtfred/src/mission/dialogs/MissionEventsDialogModel.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const SCP_vector<SCP_string>& MissionEventsDialogModel::getExtraHeadAnis()
3131
MissionEventsDialogModel::MissionEventsDialogModel(QObject* parent, fso::fred::EditorViewport* viewport, SexpTreeModel& tree_model)
3232
: AbstractDialogModel(parent, viewport), m_tree_model(tree_model)
3333
{
34-
initializeData();
3534
}
3635

3736
bool MissionEventsDialogModel::apply()

qtfred/src/mission/dialogs/MissionEventsDialogModel.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ class MissionEventsDialogModel : public AbstractDialogModel {
118118
const SCP_vector<MMessage>& getMessageList() const;
119119
static bool getMissionIsMultiTeam();
120120

121+
void initializeData();
122+
121123
void setModified();
122124

123125
signals:
@@ -131,7 +133,6 @@ class MissionEventsDialogModel : public AbstractDialogModel {
131133
void annotationApplied(int node_index, const SCP_string& note, int r, int g, int b, bool has_color);
132134

133135
private:
134-
void initializeData();
135136

136137
void initializeEvents();
137138
void initializeEventAnnotations();

qtfred/src/ui/dialogs/MissionEventsDialog.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ MissionEventsDialog::MissionEventsDialog(QWidget* parent, EditorViewport* viewpo
133133
sexp_tree_view::applyVisuals(it);
134134
});
135135

136+
// Load data now that all signals are connected, so tree-building signals
137+
// (treeCleared, subtreeAdded, annotationApplied) are received by the dialog.
138+
_model->initializeData();
139+
136140
initMessageWidgets();
137141

138142
initEventWidgets();

0 commit comments

Comments
 (0)