From 3fb99fa4b53212cf953002ce29757c318c9c4668 Mon Sep 17 00:00:00 2001 From: Pieter van der Kloet Date: Sun, 31 Jul 2011 17:43:16 +0200 Subject: [PATCH 1/3] Modified Ogre exception handling to get rid of a compiler warning --- apps/launcher/graphicspage.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 779b07607..de3b0211e 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -190,8 +190,7 @@ void GraphicsPage::setupOgre() msgBox.setDetailedText(ogreError); msgBox.exec(); - QString error = QString("Error creating Ogre::Root, the error reported was: %0").arg(ogreError); - qCritical(error.toAscii()); + qCritical("Error creating Ogre::Root, the error reported was:\n %s", qPrintable(ogreError)); std::exit(1); } From 8c4a246abdaf9c67ef667825891da5ddde766039 Mon Sep 17 00:00:00 2001 From: Pieter van der Kloet Date: Sun, 31 Jul 2011 18:13:24 +0200 Subject: [PATCH 2/3] Disabled Ogre debug output to stdout/stderr --- apps/launcher/graphicspage.cpp | 4 ++++ apps/launcher/main.cpp | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index de3b0211e..147dbd15e 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -172,6 +172,10 @@ void GraphicsPage::setupOgre() pluginCfg = QString::fromStdString(Files::getPath(Files::Path_ConfigUser, "openmw", "plugins.cfg")); } + + // Create a log manager so we can surpress debug text to stdout/stderr + Ogre::LogManager* logMgr = OGRE_NEW Ogre::LogManager; + logMgr->createLog("Ogre.log", true, false, false); try { diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp index c89a14f5f..4e438a4db 100644 --- a/apps/launcher/main.cpp +++ b/apps/launcher/main.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include "maindialog.hpp" @@ -24,10 +23,6 @@ int main(int argc, char *argv[]) // Load the stylesheet QFile file("./launcher.qss"); - - QFileInfo fi(file); - - qDebug() << "Stylesheet path is: " << fi.absoluteFilePath(); file.open(QFile::ReadOnly); QString styleSheet = QLatin1String(file.readAll()); From 88edbad7178912aaccf0d79350f735a1bdafd982 Mon Sep 17 00:00:00 2001 From: Pieter van der Kloet Date: Sun, 31 Jul 2011 19:17:52 +0200 Subject: [PATCH 3/3] Changed plugins.cfg lookup code to include the global directory --- apps/launcher/graphicspage.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 147dbd15e..0074346e7 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -165,7 +165,6 @@ void GraphicsPage::setupConfig() void GraphicsPage::setupOgre() { QString pluginCfg = "./plugins.cfg"; - QFile file(pluginCfg); if (!file.exists()) { @@ -173,9 +172,18 @@ void GraphicsPage::setupOgre() "openmw", "plugins.cfg")); } + // Reopen the file from user directory + file.setFileName(pluginCfg); + + if (!file.exists()) { + // There's no plugins.cfg in the user directory, use global directory + pluginCfg = QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal, + "openmw", "plugins.cfg")); + } + // Create a log manager so we can surpress debug text to stdout/stderr Ogre::LogManager* logMgr = OGRE_NEW Ogre::LogManager; - logMgr->createLog("Ogre.log", true, false, false); + logMgr->createLog("launcherOgre.log", true, false, false); try {