bugfix: tutorial broken

2 files changed, 9 insertions, 9 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 0253ad4a..1e25a39c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -347,11 +347,6 @@ int main(int argc, char *argv[])
                              );

   application.setProperty("dataPath", dataPath);

 

-#if QT_VERSION >= 0x050000

-  qDebug("ssl support: %d", QSslSocket::supportsSsl());

-#endif

-

-  qDebug("data path: %s", qPrintable(dataPath));

   if (!QDir(dataPath).exists()) {

     if (!QDir().mkpath(dataPath)) {

       qCritical("failed to create %s", qPrintable(dataPath));

@@ -378,6 +373,10 @@ int main(int argc, char *argv[])
 

   LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");

 

+#if QT_VERSION >= 0x050000

+  qDebug("ssl support: %d", QSslSocket::supportsSsl());

+#endif

+

   qDebug("Working directory: %s", qPrintable(QDir::toNativeSeparators(QDir::currentPath())));

   qDebug("MO at: %s", qPrintable(QDir::toNativeSeparators(application.applicationDirPath())));

   QPixmap pixmap(":/MO/gui/splash");

@@ -510,7 +509,6 @@ int main(int argc, char *argv[])
 

     organizer.updateExecutablesList(settings);

 

-

     QString selectedProfileName = determineProfile(arguments, settings);

     organizer.setCurrentProfile(selectedProfileName);

 

@@ -532,7 +530,8 @@ int main(int argc, char *argv[])
     }

 

     qDebug("initializing tutorials");

-    TutorialManager::init(qApp->applicationDirPath() + "/" + QString::fromStdWString(AppConfig::tutorialsPath()) + "/");

+    TutorialManager::init(qApp->applicationDirPath() + "/" + QString::fromStdWString(AppConfig::tutorialsPath()) + "/",

+                          &organizer);

 

     if (!application.setStyleFile(settings.value("Settings/style", "").toString())) {

       // disable invalid stylesheet

diff --git a/src/tutorials/tutorial_firststeps_main.js b/src/tutorials/tutorial_firststeps_main.js
index 5ee4e790..2bc270d7 100644
--- a/src/tutorials/tutorial_firststeps_main.js
+++ b/src/tutorials/tutorial_firststeps_main.js
@@ -61,6 +61,7 @@ function getTutorialSteps()
     },

 

     function() {

+        unhighlight()

         tutorial.text = qsTr("Now it's time to install a few mods!"

                             + "Please go along with this because we need a few mods installed to demonstrate other features")

         waitForClick()

@@ -86,13 +87,13 @@ function getTutorialSteps()
 

     function() {

         tutorial.text = qsTr("Downloads will appear on the \"Downloads\"-tab here. You have to download and install at least one mod to proceed.")

-        applicationWindow.modInstalled.connect(nextStep)

+        organizer.modInstalled.connect(nextStep)

         highlightItem("tabWidget", true)

     },

 

     function() {

         unhighlight()

-        applicationWindow.modInstalled.disconnect(nextStep)

+        organizer.modInstalled.disconnect(nextStep)

         tutorial.text = qsTr("Great, you just installed your first mod. Please note that the installation procedure may differ based on how a mod was packaged.")

         waitForClick()

     },