mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-03 14:09:39 +00:00
Code Issues Releases Wiki Activity

Fixed Qt exits, this time for all occurrences

Browse source
This commit is contained in:
Pieter van der Kloet 2012-02-28 21:00:02 +01:00
parent dc1fe6fb4d
commit b320733e45
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/launcher/datafilespage.cpp
View file

@ -1015,7 +1015,8 @@ void DataFilesPage::writeConfig(QString profile)
Please make sure you have the right permissions and try again.<br>").arg(file.fileName())); Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
msgBox.exec(); msgBox.exec();
QApplication::exit(1); qApp->exit(1);
return;
} }
QTextStream in(&file); QTextStream in(&file);
@ -1041,7 +1042,8 @@ void DataFilesPage::writeConfig(QString profile)
Please make sure you have the right permissions and try again.<br>").arg(file.fileName())); Please make sure you have the right permissions and try again.<br>").arg(file.fileName()));
msgBox.exec(); msgBox.exec();
QApplication::exit(1); qApp->exit(1);
return;
} }
file.write(buffer); file.write(buffer);

11
apps/launcher/graphicspage.cpp
View file

@ -180,7 +180,7 @@ void GraphicsPage::setupOgre()
Make sure you have write access to<br>%1<br><br>")).arg(configDir.path())); Make sure you have write access to<br>%1<br><br>")).arg(configDir.path()));
msgBox.exec(); msgBox.exec();
QApplication::exit(1); qApp->exit(1);
return; return;
} }
@ -203,7 +203,7 @@ void GraphicsPage::setupOgre()
qCritical("Error creating Ogre::Root, the error reported was:\n %s", qPrintable(ogreError)); qCritical("Error creating Ogre::Root, the error reported was:\n %s", qPrintable(ogreError));
QApplication::exit(1); qApp->exit(1);
return; return;
} }
@ -237,7 +237,7 @@ void GraphicsPage::setupOgre()
Please make sure the plugins.cfg file exists and contains a valid rendering plugin.<br>")); Please make sure the plugins.cfg file exists and contains a valid rendering plugin.<br>"));
msgBox.exec(); msgBox.exec();
QApplication::exit(1); qApp->exit(1);
return; return;
} }
@ -423,7 +423,7 @@ void GraphicsPage::writeConfig()
qCritical("Error validating configuration"); qCritical("Error validating configuration");
QApplication::exit(1); qApp->exit(1);
return; return;
} }
@ -449,7 +449,8 @@ void GraphicsPage::writeConfig()
qCritical("Error saving Ogre configuration, the error reported was:\n %s", qPrintable(ogreError)); qCritical("Error saving Ogre configuration, the error reported was:\n %s", qPrintable(ogreError));
QApplication::exit(1); qApp->exit(1);
return;
} }
} }