Skip to content

Commit 4416dfc

Browse files
authored
make sure we don't set modified during init (#7417)
1 parent 2b48778 commit 4416dfc

34 files changed

Lines changed: 53 additions & 14 deletions

qtfred/src/mission/Editor.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ void Editor::unmark_all() {
522522
numMarked = 0;
523523
setupCurrentObjectIndices(-1);
524524

525-
missionChanged();
525+
updateAllViewports();
526526
}
527527
}
528528
void Editor::markObject(int obj) {
@@ -561,7 +561,7 @@ void Editor::unmarkObject(int obj) {
561561
setupCurrentObjectIndices(-1); // can't find one; nothing is marked.
562562
}
563563

564-
missionChanged();
564+
updateAllViewports();
565565
}
566566
}
567567

@@ -755,8 +755,6 @@ void Editor::selectObject(int objId) {
755755
}
756756

757757
setupCurrentObjectIndices(objId); // select the new object
758-
759-
missionChanged();
760758
}
761759
void Editor::updateAllViewports() {
762760
// This takes all renderers and issues an update request for each of them. For now that is only one but this allows

qtfred/src/mission/dialogs/AsteroidEditorDialogModel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void AsteroidEditorDialogModel::initializeData()
9595
debrisOptions.emplace_back(std::make_pair(Asteroid_info[i].name, static_cast<int>(i)));
9696
}
9797
}
98-
98+
_modified = false;
9999
}
100100

101101
void AsteroidEditorDialogModel::update_internal_field()

qtfred/src/mission/dialogs/BackgroundEditorDialogModel.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ extern void parse_one_background(background_t* background);
1515
namespace fso::fred::dialogs {
1616
BackgroundEditorDialogModel::BackgroundEditorDialogModel(QObject* parent, EditorViewport* viewport)
1717
: AbstractDialogModel(parent, viewport)
18+
{
19+
initializeData();
20+
}
21+
22+
void BackgroundEditorDialogModel::initializeData()
1823
{
1924
auto& bg = getActiveBackground();
2025
auto& bm_list = bg.bitmaps;
@@ -26,6 +31,7 @@ BackgroundEditorDialogModel::BackgroundEditorDialogModel(QObject* parent, Editor
2631
if (!sun_list.empty()) {
2732
_selectedSunIndex = 0;
2833
}
34+
_modified = false;
2935
}
3036

3137
bool BackgroundEditorDialogModel::apply()

qtfred/src/mission/dialogs/BackgroundEditorDialogModel.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ class BackgroundEditorDialogModel : public AbstractDialogModel {
170170
void setLightingProfileName(const SCP_string& name);
171171

172172
private:
173+
void initializeData();
173174
void refreshBackgroundPreview();
174175
static background_t& getActiveBackground();
175176
starfield_list_entry* getActiveBitmap() const;

qtfred/src/mission/dialogs/BriefingEditorDialogModel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ void BriefingEditorDialogModel::initializeData()
126126
_currentTeam = 0;
127127
_currentStage = 0;
128128
_currentIcon = -1;
129+
_modified = false;
129130
}
130131

131132
void BriefingEditorDialogModel::stopSpeech()

qtfred/src/mission/dialogs/CommandBriefingDialogModel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ void CommandBriefingDialogModel::initializeData()
3939

4040
_currentTeam = 0; // default to the first team
4141
_currentStage = 0; // default to the first stage
42+
_modified = false;
4243
}
4344

4445
void CommandBriefingDialogModel::gotoPreviousStage()

qtfred/src/mission/dialogs/DebriefingDialogModel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ void DebriefingDialogModel::initializeData()
4848

4949
_currentTeam = 0;
5050
_currentStage = 0;
51+
_modified = false;
5152
}
5253

5354
void DebriefingDialogModel::gotoPreviousStage()

qtfred/src/mission/dialogs/FictionViewerDialogModel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bool FictionViewerDialogModel::apply() {
1919
_fictionViewerStages.clear();
2020
Mission_music[SCORE_FICTION_VIEWER] = -1;
2121
} else {
22-
// Keep whatever youve edited in _fictionViewerStages
22+
// Keep whatever you've edited in _fictionViewerStages
2323
Mission_music[SCORE_FICTION_VIEWER] = _fictionMusic; // -1 for none is valid
2424
}
2525

@@ -52,6 +52,7 @@ void FictionViewerDialogModel::initializeData() {
5252

5353
// music is managed through the mission
5454
_fictionMusic = Mission_music[SCORE_FICTION_VIEWER];
55+
_modified = false;
5556
}
5657

5758
const SCP_vector<std::pair<SCP_string, int>>& FictionViewerDialogModel::getMusicOptions()

qtfred/src/mission/dialogs/JumpNodeEditorDialogModel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ void JumpNodeEditorDialogModel::initializeData()
117117
}
118118

119119
Q_EMIT jumpNodeMarkingChanged();
120+
_modified = false;
120121
}
121122

122123
void JumpNodeEditorDialogModel::buildNodeList()

qtfred/src/mission/dialogs/MissionCutscenesDialogModel.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ void MissionCutscenesDialogModel::initializeData()
5757

5858
cur_cutscene = -1;
5959
modelChanged();
60+
_modified = false;
6061
}
6162
SCP_vector<mission_cutscene>& MissionCutscenesDialogModel::getCutscenes()
6263
{

0 commit comments

Comments
 (0)