From a6f7480ab9c9f6b8b937436fa06ded1b80ec0426 Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 8 Apr 2015 18:09:36 +0200 Subject: bugfix: tutorial broken --- src/main.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') 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 -- cgit v1.3.1