From 287168a6cc360ddd8af3194097b78b8b2732d8ea Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 26 May 2017 05:04:49 -0500 Subject: [PATCH] Fix Wizard accept to work with the setAccept accept funcs --- src/nostalgia/studio/lib/wizard.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nostalgia/studio/lib/wizard.cpp b/src/nostalgia/studio/lib/wizard.cpp index c9c88fe1..076be095 100644 --- a/src/nostalgia/studio/lib/wizard.cpp +++ b/src/nostalgia/studio/lib/wizard.cpp @@ -331,9 +331,9 @@ void Wizard::setAccept(std::function acceptFunc) { void Wizard::accept() { auto page = dynamic_cast(currentPage()); - if (page == nullptr || page->accept() == 0) { + if (page != nullptr && page->accept() == 0) { QDialog::accept(); - } else if(m_acceptFunc != nullptr && m_acceptFunc() == 0) { + } else if (m_acceptFunc != nullptr && m_acceptFunc() == 0) { QDialog::accept(); } }