diff options
| -rw-r--r-- | ui/qt/qcustomplot.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ui/qt/qcustomplot.cpp b/ui/qt/qcustomplot.cpp index 1573f02920..eab739aa29 100644 --- a/ui/qt/qcustomplot.cpp +++ b/ui/qt/qcustomplot.cpp @@ -2845,8 +2845,9 @@ int QCPLayoutGrid::elementCount() const /* inherits documentation from base class */ QCPLayoutElement *QCPLayoutGrid::elementAt(int index) const { - if (index >= 0 && index < elementCount()) - return mElements.at(index / columnCount()).at(index % columnCount()); + int colC = columnCount(); + if (index >= 0 && colC && index < elementCount()) + return mElements.at(index / colC).at(index % colC); else return 0; } @@ -2854,10 +2855,16 @@ QCPLayoutElement *QCPLayoutGrid::elementAt(int index) const /* inherits documentation from base class */ QCPLayoutElement *QCPLayoutGrid::takeAt(int index) { + + int colC = columnCount(); + if(colC == 0) + return 0; + if (QCPLayoutElement *el = elementAt(index)) { + releaseElement(el); - mElements[index / columnCount()][index % columnCount()] = 0; + mElements[index / colC][index % colC] = 0; return el; } else { |