mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-22 03:07:20 +01:00
bugfix 2606
This commit is contained in:
parent
580197d94e
commit
35fabc2d8d
@ -1503,6 +1503,8 @@ void FWWindow::recreateWindowsMenu ()
|
||||
ProjectPanel * pp = dynamic_cast <ProjectPanel *>(subWindowList[i]->widget());
|
||||
if (pp!=NULL)
|
||||
{
|
||||
if (pp->isClosing())
|
||||
continue ;
|
||||
QString text = pp->getFileName ();
|
||||
windowsTitles.push_back(text);
|
||||
if (text=="")
|
||||
|
||||
@ -155,6 +155,7 @@ void ProjectPanel::initMain(FWWindow *main)
|
||||
mainW = main;
|
||||
firstResize = false ;
|
||||
firstLoad = false;
|
||||
closing = false ;
|
||||
oldState=-1;
|
||||
if (st->getInfoStyle()!=0) m_panel->oi->show();
|
||||
else m_panel->oi->hide();
|
||||
@ -3694,8 +3695,10 @@ void ProjectPanel::closeEvent( QCloseEvent * ev)
|
||||
ev->ignore();
|
||||
return;
|
||||
}
|
||||
closing = true ;
|
||||
QWidget::closeEvent(ev);
|
||||
mw->updateWindowTitle();
|
||||
mw->recreateWindowsMenu();
|
||||
// emit closed();
|
||||
}
|
||||
|
||||
|
||||
@ -66,6 +66,7 @@ class ProjectPanel: public QWidget {
|
||||
bool editingTemplateLib;
|
||||
bool ruleSetRedrawPending;
|
||||
bool firstResize;
|
||||
bool closing ;
|
||||
QString startupFileName;
|
||||
|
||||
libfwbuilder::FWObjectDatabase *objdb;
|
||||
@ -114,7 +115,7 @@ public:
|
||||
ProjectPanel * clone (ProjectPanel * cln);
|
||||
void openRuleSet (libfwbuilder::FWObject * obj);
|
||||
FWBTree * getFWTree () {return objectTreeFormat;}
|
||||
|
||||
bool isClosing (){return closing;}
|
||||
QMdiSubWindow *mdiWindow;
|
||||
Ui::ProjectPanel_q *m_panel;
|
||||
FindObjectWidget *findObjectWidget;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user