summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Groman <tgroman@nuegia.net>2018-12-10 00:27:45 -0800
committerThomas Groman <tgroman@nuegia.net>2018-12-10 00:27:45 -0800
commit15b04af5239abf627e48cdafae7e5e48c38e75cd (patch)
treee548f67432edfff5a365e4098664dce01969ebc4
parented31fd7be79f85d82ab6b9de57c39d0d58fd51f3 (diff)
downloadMultiMC-15b04af5239abf627e48cdafae7e5e48c38e75cd.tar
MultiMC-15b04af5239abf627e48cdafae7e5e48c38e75cd.tar.gz
MultiMC-15b04af5239abf627e48cdafae7e5e48c38e75cd.tar.lz
MultiMC-15b04af5239abf627e48cdafae7e5e48c38e75cd.tar.xz
MultiMC-15b04af5239abf627e48cdafae7e5e48c38e75cd.zip
Fixed syntax error and commented out Ganalytics requirements
-rw-r--r--application/MultiMC.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index 7ea92a41..9e35717a 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -509,8 +509,8 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
m_settings->registerSetting("Analytics", true);
m_settings->registerSetting("AnalyticsSeen", 0);
m_settings->registerSetting("AnalyticsClientID", QString());
-*/ }
-
+ }
+*/
// Init page provider
{
m_globalSettingsProvider = std::make_shared<GenericPageProvider>(tr("Settings"));
@@ -731,7 +731,7 @@ bool MultiMC::createSetupWizard()
return true;
}
return false;
-/* }();
+ }/*();
bool analyticsRequired = [&]()
{
if(BuildConfig.ANALYTICS_ID.isEmpty())
@@ -747,14 +747,15 @@ bool MultiMC::createSetupWizard()
return true;
}
return false;
- }(); */
+ }*/();
bool languageRequired = [&]()
{
if (settings()->get("Language").toString().isEmpty())
return true;
return false;
}();
- bool wizardRequired = javaRequired || analyticsRequired || languageRequired;
+/* bool wizardRequired = javaRequired || analyticsRequired || languageRequired;
+*/ bool wizardRequired = javaRequired || languageRequired;
if(wizardRequired)
{
@@ -767,11 +768,11 @@ bool MultiMC::createSetupWizard()
{
m_setupWizard->addPage(new JavaWizardPage(m_setupWizard));
}
- if(analyticsRequired)
+/* if(analyticsRequired)
{
m_setupWizard->addPage(new AnalyticsWizardPage(m_setupWizard));
}
- connect(m_setupWizard, &QDialog::finished, this, &MultiMC::setupWizardFinished);
+*/ connect(m_setupWizard, &QDialog::finished, this, &MultiMC::setupWizardFinished);
m_setupWizard->show();
return true;
}