Merge branch 'master' into pu/msgbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 28acb0fefa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
2016-10-27 10:13:45 +02:00
7 changed files with 81 additions and 26 deletions

View File

@@ -1389,7 +1389,7 @@ void CMenuWidget::saveScreen()
delete[] background;
background = new fb_pixel_t [full_width * full_height];
background = new fb_pixel_t [full_width * (full_height+fbutton_height)];
if(background)
frameBuffer->SaveScreen(x /*-ConnectLineBox_Width*/, y, full_width, full_height + fbutton_height, background);
}