mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

null pointer check

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-08-23 13:03:34 +02:00
parent e58e72635b
commit 527c0de33a
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/widget/helpbox.cpp
View File

@@ -99,16 +99,18 @@ void Helpbox::addLine(const std::string& icon, const std::string& text, const in
if (!text.empty()){ if (!text.empty()){
int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0); int x_text = w_picon + (picon ? OFFSET_INNER_MID : 0);
CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, 0, text, text_mode, font); CComponentsText * txt = new CComponentsText(x_text, 0, line->getWidth()-x_text, 0, text, text_mode, font);
txt->doPaintBg(false); if(txt){
txt->forceTextPaint(); txt->doPaintBg(false);
txt->forceTextPaint();
#if 0 //"contrast agent", if you want to see where the text items are drawn. #if 0 //"contrast agent", if you want to see where the text items are drawn.
txt->setColorBody(COL_RED); txt->setColorBody(COL_RED);
#endif #endif
int lines = txt->getCTextBoxObject()->getLines(); int lines = txt->getCTextBoxObject()->getLines();
txt_height = std::max(lines*font->getHeight(), h_line); txt_height = std::max(lines*font->getHeight(), h_line);
txt->setHeight(txt_height); txt->setHeight(txt_height);
line->addCCItem(txt); line->addCCItem(txt);
}
} }
if (txt_height > line->getHeight()) if (txt_height > line->getHeight())

8
src/gui/widget/listframe.cpp
View File

@@ -58,10 +58,10 @@
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <driver/fontrenderer.h> #include <driver/fontrenderer.h>
#define MAX_WINDOW_WIDTH (frameBuffer->getScreenWidth() - 40) #define MAX_WINDOW_WIDTH (frameBuffer ? frameBuffer->getScreenWidth() - 40:0)
#define MAX_WINDOW_HEIGHT (frameBuffer->getScreenHeight() - 40) #define MAX_WINDOW_HEIGHT (frameBuffer ? frameBuffer->getScreenHeight() - 40:0)
#define MIN_WINDOW_WIDTH (frameBuffer->getScreenWidth() >> 1) #define MIN_WINDOW_WIDTH (frameBuffer ? frameBuffer->getScreenWidth() >> 1:0)
#define MIN_WINDOW_HEIGHT 40 #define MIN_WINDOW_HEIGHT 40
#define TITLE_BACKGROUND_COLOR COL_MENUHEAD_PLUS_0 #define TITLE_BACKGROUND_COLOR COL_MENUHEAD_PLUS_0
@@ -206,7 +206,7 @@ void CListFrame::reSizeMainFrameWidth(int textWidth)
int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*OFFSET_INNER_MID; int iNewWindowWidth = textWidth + m_cFrameScrollRel.iWidth + 2*OFFSET_INNER_MID;
if( iNewWindowWidth > m_nMaxWidth) iNewWindowWidth = m_nMaxWidth; if(iNewWindowWidth > m_nMaxWidth) iNewWindowWidth = m_nMaxWidth;
if((unsigned int) iNewWindowWidth < MIN_WINDOW_WIDTH) iNewWindowWidth = MIN_WINDOW_WIDTH; if((unsigned int) iNewWindowWidth < MIN_WINDOW_WIDTH) iNewWindowWidth = MIN_WINDOW_WIDTH;
m_cFrame.iWidth = iNewWindowWidth; m_cFrame.iWidth = iNewWindowWidth;