mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 02:45:32 +00:00
Code Issues Releases Wiki Activity

Check all views before exiting.

Browse source
This commit is contained in:
cc9cii 2014-09-07 18:35:50 +10:00
parent e315a72582
commit dba352fd6f
1 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
apps/opencs/view/doc/viewmanager.cpp
View file

@ -174,15 +174,15 @@ bool CSVDoc::ViewManager::closeRequest (View *view)
bool continueWithClose = true; bool continueWithClose = true;
if (iter!=mViews.end()) if (iter!=mViews.end()) // found view in mViews
{ {
bool last = countViews (view->getDocument())<=1; bool last = countViews (view->getDocument())<=1;
if (last) if (last) // only this view for the document
continueWithClose = notifySaveOnClose (view); continueWithClose = notifySaveOnClose (view);
else else
{ {
(*iter)->deleteLater(); (*iter)->deleteLater(); // there are other views, delete this one
mViews.erase (iter); mViews.erase (iter);
updateIndices(); updateIndices();
@ -343,6 +343,37 @@ void CSVDoc::ViewManager::onExitWarningHandler (int state, CSMDoc::Document *doc
void CSVDoc::ViewManager::exitApplication (CSVDoc::View *view) void CSVDoc::ViewManager::exitApplication (CSVDoc::View *view)
{ {
if (notifySaveOnClose (view)) // close the current view first
QApplication::instance()->exit(); if(!closeRequest(view))
return; // don't exit the application
else
{
view->deleteLater(); // ok to close the current view
view->setVisible(false);
std::vector<View *>::iterator iter = std::find (mViews.begin(), mViews.end(), view);
if (iter!=mViews.end())
{
mViews.erase (iter);
updateIndices();
}
// attempt to close all other views
while(!mViews.empty())
{
// raise the window
mViews.back()->activateWindow();
mViews.back()->raise();
// attempt to close it
if (!closeRequest(mViews.back()))
return;
else
{
mViews.back()->deleteLater();
mViews.back()->setVisible(false);
mViews.pop_back();
updateIndices();
}
}
}
QApplication::instance()->exit();
} }