Skip to content

Commit e7769a2

Browse files
authored
Merge pull request #1578 from OutpostUniverse/updateNas2dFade
Update NAS2D submodule for `Fade` updates
2 parents 0054c0d + da339fe commit e7769a2

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

appOPHD/States/MainMenuState.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ MainMenuState::MainMenuState() :
2525
{constants::MainMenuQuit, {this, &MainMenuState::onQuit}}
2626
}},
2727
lblVersion{constants::Version},
28-
mReturnState{this}
28+
mReturnState{this},
29+
mFade{{this, &MainMenuState::onFadeComplete}}
2930
{}
3031

3132

@@ -36,7 +37,6 @@ MainMenuState::~MainMenuState()
3637
eventHandler.keyDown().disconnect({this, &MainMenuState::onKeyDown});
3738

3839
NAS2D::Utility<NAS2D::Mixer>::get().stopAllAudio();
39-
mFade.fadeComplete().disconnect({this, &MainMenuState::onFadeComplete});
4040
}
4141

4242

@@ -69,7 +69,6 @@ void MainMenuState::initialize()
6969

7070
auto& renderer = NAS2D::Utility<NAS2D::Renderer>::get();
7171
renderer.showSystemPointer(true);
72-
mFade.fadeComplete().connect({this, &MainMenuState::onFadeComplete});
7372
mFade.fadeIn(constants::FadeSpeed);
7473

7574
NAS2D::Mixer& mixer = NAS2D::Utility<NAS2D::Mixer>::get();

0 commit comments

Comments
 (0)