krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Added some useful error messages when things go wrong with Ogre

Browse source
This commit is contained in:
Pieter van der Kloet 2011-09-06 02:02:34 +02:00
parent ccfd011df6
commit b60bb408fd
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/launcher/graphicspage.cpp
View file

@ -189,24 +189,6 @@ void GraphicsPage::setupOgre()
"openmw", "ogre.cfg"));
file.setFileName(ogreCfg);
/* Not yet supported by OpenMW as it only seems to look in the user directory for ogre.cfg
QString ogreCfg = "./ogre.cfg";
file.setFileName(ogreCfg);
if (!file.exists()) {
file.setFileName(QString::fromStdString(Files::getPath(Files::Path_ConfigUser,
"openmw", "ogre.cfg")));
}
if (!file.exists()) {
file.setFileName(QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal,
"openmw", "ogre.cfg")));
}
if (!file.exists()) {
file.setFileName(ogreCfg);
}*/
try
{
mOgre = new Ogre::Root(pluginCfg.toStdString(), file.fileName().toStdString(), "./launcherOgre.log");
@ -428,7 +410,27 @@ void GraphicsPage::writeConfig()
mOpenGLRenderSystem->setConfigOption("Video Mode", mOGLResolutionComboBox->currentText().toStdString());
}
//mOpenGLRenderSystem->validateConfigOptions();
// Now we validate the options
QString ogreError = QString::fromStdString(mSelectedRenderSystem->validateConfigOptions());
if (!ogreError.isEmpty()) {
QMessageBox msgBox;
msgBox.setWindowTitle("Error validating configuration");
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(tr("<br><b>A problem occured while validating the graphics options</b><br><br> \
The graphics options could not be saved.<br><br> \
Press \"Show Details...\" for more information.<br>"));
msgBox.setDetailedText(ogreError);
msgBox.exec();
Ogre::LogManager::getSingletonPtr()->logMessage( "Caught exception in validateConfigOptions");
qCritical("Error validating configuration");
std::exit(1);
}
// Write the settings to the config file
mOgre->saveConfig();