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

Fix logic errors.

Browse source
This commit is contained in:
cc9cii 2014-09-09 21:09:37 +10:00
parent 84f5784575
commit 4471fe771e
3 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/view/doc/view.cpp
View file

@ -27,7 +27,7 @@ void CSVDoc::View::closeEvent (QCloseEvent *event)
else
{
// closeRequest() returns true if last document
mViewManager.removeDocument(mDocument);
mViewManager.removeDocAndView(mDocument);
}
}

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

@ -172,7 +172,7 @@ bool CSVDoc::ViewManager::closeRequest (View *view)
{
std::vector<View *>::iterator iter = std::find (mViews.begin(), mViews.end(), view);
bool continueWithClose = true;
bool continueWithClose = false;
if (iter!=mViews.end())
{
@ -192,10 +192,22 @@ bool CSVDoc::ViewManager::closeRequest (View *view)
return continueWithClose;
}
void CSVDoc::ViewManager::removeDocument (CSMDoc::Document *document)
// NOTE: This method assumes that it is called only if the last document
void CSVDoc::ViewManager::removeDocAndView (CSMDoc::Document *document)
{
if(document)
for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
{
// the first match should also be the only match
if((*iter)->getDocument() == document)
{
mDocumentManager.removeDocument(document);
(*iter)->deleteLater();
mViews.erase (iter);
updateIndices();
return;
}
}
}
bool CSVDoc::ViewManager::notifySaveOnClose (CSVDoc::View *view)
@ -354,14 +366,23 @@ void CSVDoc::ViewManager::exitApplication (CSVDoc::View *view)
return;
else
{
// don't bother closing views or updating indicies, but remove from mViews
CSMDoc::Document * document = view->getDocument();
removeDocument(document);
view->setVisible(false);
std::vector<View *> remainingViews;
for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
{
if(document == (*iter)->getDocument())
(*iter)->setVisible(false);
else
remainingViews.push_back(*iter);
}
mDocumentManager.removeDocument(document);
mViews = remainingViews;
// attempt to close all other documents
while(!mViews.empty())
{
// raise the window
// raise the window to alert the user
mViews.back()->activateWindow();
mViews.back()->raise();
if (!notifySaveOnClose(mViews.back()))
@ -369,9 +390,16 @@ void CSVDoc::ViewManager::exitApplication (CSVDoc::View *view)
else
{
document = mViews.back()->getDocument();
removeDocument(document);
mViews.back()->setVisible(false);
mViews.pop_back();
remainingViews.clear();
for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
{
if(document == (*iter)->getDocument())
(*iter)->setVisible(false);
else
remainingViews.push_back(*iter);
}
mDocumentManager.removeDocument(document);
mViews = remainingViews;
}
}
}

2
apps/opencs/view/doc/viewmanager.hpp
View file

@ -55,7 +55,7 @@ namespace CSVDoc
///< Return number of views for \a document.
bool closeRequest (View *view);
void removeDocument (CSMDoc::Document *document);
void removeDocAndView (CSMDoc::Document *document);
signals: