Skip to content

QtFRED fix audio handle guards #7575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MjnMixael wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

QtFRED fix audio handle guards #7575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qtfred/src/mission/dialogs/CampaignEditorDialogModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ void CampaignEditorDialogModel::sortMissions()

void CampaignEditorDialogModel::stopSpeech()
{
if (_waveId >= -1) {
if (_waveId >= 0) {
audiostream_close_file(_waveId, false);
_waveId = -1;
}
Expand Down
2 changes: 1 addition & 1 deletion qtfred/src/mission/dialogs/CampaignEditorDialogModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class CampaignEditorDialogModel : public AbstractDialogModel {
int m_current_mission_index = -1;
int m_current_branch_index = -1;

int _waveId;
int _waveId = -1;

CampaignFormat m_save_format = CampaignFormat::FSO;

Expand Down
2 changes: 1 addition & 1 deletion qtfred/src/mission/dialogs/CommandBriefingDialogModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ bool CommandBriefingDialogModel::getMissionIsMultiTeam()

void CommandBriefingDialogModel::stopSpeech()
{
if (_waveId >= -1) {
if (_waveId >= 0) {
audiostream_close_file(_waveId, false);
_waveId = -1;
}
Expand Down
2 changes: 1 addition & 1 deletion qtfred/src/mission/dialogs/CommandBriefingDialogModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class CommandBriefingDialogModel: public AbstractDialogModel {
cmd_brief _wipCommandBrief[MAX_TVT_TEAMS];
int _currentTeam;
int _currentStage;
int _waveId;
int _waveId = -1;
SCP_vector<std::pair<SCP_string, int>> _teamList;
};

Expand Down
2 changes: 1 addition & 1 deletion qtfred/src/mission/dialogs/DebriefingDialogModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ bool DebriefingDialogModel::getMissionIsMultiTeam()

void DebriefingDialogModel::stopSpeech()
{
if (_waveId >= -1) {
if (_waveId >= 0) {
audiostream_close_file(_waveId, false);
_waveId = -1;
}
Expand Down
2 changes: 1 addition & 1 deletion qtfred/src/mission/dialogs/DebriefingDialogModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class DebriefingDialogModel: public AbstractDialogModel {

int _currentTeam;
int _currentStage;
int _waveId;
int _waveId = -1;
SCP_vector<std::pair<SCP_string, int>> _teamList;
};

Expand Down
Loading