more clean up
This commit is contained in:
+4
-10
@@ -684,20 +684,10 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
|
|||||||
|
|
||||||
if (!overwriteDups)
|
if (!overwriteDups)
|
||||||
{
|
{
|
||||||
bool alloc_ok = true;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
frames.append(tempFrame);
|
frames.append(tempFrame);
|
||||||
}
|
|
||||||
catch (const std::exception& ex)
|
|
||||||
{
|
|
||||||
alloc_ok = false;
|
|
||||||
qDebug() << "addFrame failed to append. App is probably going to crash. frames.length(): " << frames.length() << " Exception: " << ex.what();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(alloc_ok)
|
|
||||||
{
|
|
||||||
if (filters[tempFrame.frameId()] && busFilters[tempFrame.bus])
|
if (filters[tempFrame.frameId()] && busFilters[tempFrame.bus])
|
||||||
{
|
{
|
||||||
if (autoRefresh) beginInsertRows(QModelIndex(), filteredFrames.count(), filteredFrames.count());
|
if (autoRefresh) beginInsertRows(QModelIndex(), filteredFrames.count(), filteredFrames.count());
|
||||||
@@ -706,6 +696,10 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
|
|||||||
if (autoRefresh) endInsertRows();
|
if (autoRefresh) endInsertRows();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
catch (const std::exception& ex)
|
||||||
|
{
|
||||||
|
qDebug() << "addFrame failed to append. App is probably going to crash. frames.length(): " << frames.length() << " Exception: " << ex.what();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else //yes, overwrite dups
|
else //yes, overwrite dups
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user