Merge remote-tracking branch 'cc9cii/Bug-No-1301'

This commit is contained in:
Marc Zinnschlag 2014-09-16 12:52:12 +02:00
commit b31c4e2bcd
7 changed files with 91 additions and 12 deletions

View file

@ -29,6 +29,11 @@ void CSVDoc::View::closeEvent (QCloseEvent *event)
{
if (!mViewManager.closeRequest (this))
event->ignore();
else
{
// closeRequest() returns true if last document
mViewManager.removeDocAndView(mDocument);
}
}
void CSVDoc::View::setupFileMenu()
@ -650,4 +655,4 @@ void CSVDoc::View::run (const std::string& profile, const std::string& startupIn
void CSVDoc::View::stop()
{
mDocument->stopRunning();
}
}