AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-16 00:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Infinite-recursion avoidance

Browse Source
This commit is contained in:
Jack Andersen 2016-01-02 18:04:02 -10:00
parent 04a182d5bb
commit 796e6193ad
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
specter/include/Specter/Table.hpp
View File

@ -110,6 +110,7 @@ class Table : public View
} m_rowsView; } m_rowsView;
bool m_headerNeedsUpdate = false; bool m_headerNeedsUpdate = false;
bool m_inSelectRow = false;
public: public:
Table(ViewResources& res, View& parentView, ITableDataBinding* data, Table(ViewResources& res, View& parentView, ITableDataBinding* data,

10
specter/lib/Table.cpp
View File

@ -240,13 +240,19 @@ void Table::cycleSortColumn(size_t c)
void Table::selectRow(size_t r) void Table::selectRow(size_t r)
{ {
if (m_inSelectRow)
return;
if (r >= m_rows && r != -1) if (r >= m_rows && r != -1)
Log.report(LogVisor::FatalError, "selectRow out of bounds (%" PRISize ", %" PRISize ")", Log.report(LogVisor::FatalError, "selectRow out of bounds (%" PRISize ", %" PRISize ")",
r, m_rows); r, m_rows);
if (r == m_selectedRow) if (r == m_selectedRow)
{ {
if (m_state) if (m_state)
{
m_inSelectRow = true;
m_state->setSelectedRow(r); m_state->setSelectedRow(r);
m_inSelectRow = false;
}
return; return;
} }
if (m_selectedRow != -1) if (m_selectedRow != -1)
@ -266,7 +272,11 @@ void Table::selectRow(size_t r)
} }
updateSize(); updateSize();
if (m_state) if (m_state)
{
m_inSelectRow = true;
m_state->setSelectedRow(r); m_state->setSelectedRow(r);
m_inSelectRow = false;
}
} }
void Table::setMultiplyColor(const Zeus::CColor& color) void Table::setMultiplyColor(const Zeus::CColor& color)