From 88edbad7178912aaccf0d79350f735a1bdafd982 Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Sun, 31 Jul 2011 19:17:52 +0200
Subject: [PATCH] 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
     {