Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ActivityMonitor: catch the exception

Browse Source 
Having the app abort because of an uncaught exception when out of memory
is not user friendly. Just stop drawing the graphs if that ever happens.
This commit is contained in:
Adrien Destugues 2014-11-26 12:24:05 +01:00
parent 3f57b13504
commit 52051a08de
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/apps/activitymonitor/ActivityView.cpp
View File

@ -1405,20 +1405,27 @@ ActivityView::_DrawHistory(bool drawBackground)
view->SetLineMode(B_BUTT_CAP, B_ROUND_JOIN);
view->MovePenTo(B_ORIGIN);
view->BeginLineArray(steps - viewValues->Start() - 1);
try {
view->BeginLineArray(steps - viewValues->Start() - 1);
BPoint prev;
BPoint prev;
for (uint32 j = viewValues->Start(); j < steps; x += step, j++) {
float y = _PositionForValue(source, values,
viewValues->ValueAt(j));
for (uint32 j = viewValues->Start(); j < steps; x += step, j++) {
float y = _PositionForValue(source, values,
viewValues->ValueAt(j));
if (first) {
first = false;
} else
view->AddLine(prev, BPoint(x, y), source->Color());
if (first) {
first = false;
} else
view->AddLine(prev, BPoint(x, y), source->Color());
prev.Set(x, y);
prev.Set(x, y);
}
} catch(std::bad_alloc) {
// Not enough memory to allocate the line array.
// TODO we could try to draw using the slower but less memory
// consuming solution using StrokeLine.
}
view->EndLineArray();