kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-19 23:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when open Qet with a .qet file has argument

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4543 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-06-06 19:07:13 +00:00
parent 2ec0278213
commit 646f9e7dc6
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sources/ElementsCollection/elementscollectionwidget.cpp
View File

@@ -70,11 +70,15 @@ void ElementsCollectionWidget::expandFirstItems()
* @param project * @param project
*/ */
void ElementsCollectionWidget::addProject(QETProject *project) { void ElementsCollectionWidget::addProject(QETProject *project) {
m_model->addProject(project); if (m_model)
m_model->addProject(project);
else
m_waiting_project.append(project);
} }
void ElementsCollectionWidget::removeProject(QETProject *project) { void ElementsCollectionWidget::removeProject(QETProject *project) {
m_model->removeProject(project); if (m_model)
m_model->removeProject(project);
} }
bool ElementsCollectionWidget::event(QEvent *event) bool ElementsCollectionWidget::event(QEvent *event)
@@ -443,6 +447,12 @@ void ElementsCollectionWidget::reload()
new_model->addCommonCollection(false); new_model->addCommonCollection(false);
new_model->addCustomCollection(false); new_model->addCustomCollection(false);
if (!m_waiting_project.isEmpty()) {
foreach(QETProject *prj, m_waiting_project)
new_model->addProject(prj, false);
m_waiting_project.clear();
}
if (m_model) if (m_model)
foreach (QETProject *project, m_model->project()) foreach (QETProject *project, m_model->project())
new_model->addProject(project, false); new_model->addProject(project, false);

1
sources/ElementsCollection/elementscollectionwidget.h
View File

@@ -97,6 +97,7 @@ class ElementsCollectionWidget : public QWidget
*m_show_all_dir; *m_show_all_dir;
bool m_first_show = true; bool m_first_show = true;
QList<QETProject *> m_waiting_project;
}; };
#endif // ELEMENTSCOLLECTIONWIDGET_H #endif // ELEMENTSCOLLECTIONWIDGET_H