marrub
/
Maraiah
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tycho: fix activeProject returning the wrong object

master
an 2019-06-13 23:14:39 -04:00
parent 82d0d378b0
commit cb9d844404
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/tycho/cc_source/menu.cc
View File

@ -81,6 +81,8 @@ void Menu::updateActions()
bool active = view != nullptr; bool active = view != nullptr;
ui->actionMapProps->setEnabled(active); ui->actionMapProps->setEnabled(active);
dbgPrintFunc();
} }
void Menu::closeEvent(QCloseEvent *event) void Menu::closeEvent(QCloseEvent *event)
@ -97,8 +99,7 @@ void Menu::closeEvent(QCloseEvent *event)
ProjectView *Menu::activeProject() const ProjectView *Menu::activeProject() const
{ {
auto win = activeSubWindow(); return qobject_cast<ProjectView *>(activeSubWindow());
return win ? qobject_cast<ProjectView *>(win->widget()) : nullptr;
} }
QMdiSubWindow *Menu::activeSubWindow() const QMdiSubWindow *Menu::activeSubWindow() const

2
source/tycho/cc_source/projectmodel.cc
View File

@ -13,7 +13,7 @@ ProjectModel::~ProjectModel()
bool ProjectModel::isDirty() const bool ProjectModel::isDirty() const
{ {
return true; return false;
} }
bool ProjectModel::open(const QString &fname) bool ProjectModel::open(const QString &fname)