drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

Fix Wizard accept to work with the setAccept accept funcs

Browse Source
This commit is contained in:
Gary Talent 2017-05-26 05:04:49 -05:00
parent 38a3113ab6
commit 287168a6cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/studio/lib/wizard.cpp
View File

@ -331,9 +331,9 @@ void Wizard::setAccept(std::function<int()> acceptFunc) {
void Wizard::accept() { void Wizard::accept() {
auto page = dynamic_cast<WizardFormPage*>(currentPage()); auto page = dynamic_cast<WizardFormPage*>(currentPage());
if (page == nullptr || page->accept() == 0) { if (page != nullptr && page->accept() == 0) {
QDialog::accept(); QDialog::accept();
} else if(m_acceptFunc != nullptr && m_acceptFunc() == 0) { } else if (m_acceptFunc != nullptr && m_acceptFunc() == 0) {
QDialog::accept(); QDialog::accept();
} }
} }