[nostalgia] Switch Studio to PassThroughFS

2019-01-15 22:33:13 -06:00
parent e5c5c0da43
commit af0e24d9bf
26 changed files with 159 additions and 107 deletions
@@ -336,8 +336,8 @@ void Wizard::setAccept(std::function<int(QWizard*)> acceptFunc) {

 void Wizard::accept() {
 	auto page = dynamic_cast<WizardFormPage*>(currentPage());
-	if (page != nullptr and page->accept() == 0 and
-	    m_acceptFunc != nullptr and m_acceptFunc(this) == 0) {
+	if ((page == nullptr || page->accept() == 0) &&
+	    m_acceptFunc != nullptr && m_acceptFunc(this) == 0) {
 		QDialog::accept();
 	}
 }