git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9865271
)
don't crash when no left/right border pixmap defined
author
Felix Domke
<tmbinc@elitedvb.net>
Sun, 21 May 2006 19:36:21 +0000
(19:36 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sun, 21 May 2006 19:36:21 +0000
(19:36 +0000)
lib/gui/ewindowstyleskinned.cpp
patch
|
blob
|
history
diff --git
a/lib/gui/ewindowstyleskinned.cpp
b/lib/gui/ewindowstyleskinned.cpp
index b0ccba8fb64a644402875459f642ce8d21a6ca0b..03c3fb74156b4526e4a5bad3e228d8b6758056b7 100644
(file)
--- a/
lib/gui/ewindowstyleskinned.cpp
+++ b/
lib/gui/ewindowstyleskinned.cpp
@@
-241,8
+241,15
@@
void eWindowStyleSkinned::setPixmap(int bs, int bp, gPixmap &pixmap)
if (m_border[bs].m_border_bottom < m_border[bs].m_pixmap[i]->size().height())
m_border[bs].m_border_bottom = m_border[bs].m_pixmap[i]->size().height();
if (m_border[bs].m_border_bottom < m_border[bs].m_pixmap[i]->size().height())
m_border[bs].m_border_bottom = m_border[bs].m_pixmap[i]->size().height();
- m_border[bs].m_border_left = m_border[bs].m_pixmap[3]->size().width();
- m_border[bs].m_border_right = m_border[bs].m_pixmap[5]->size().width();
+ if (m_border[bs].m_pixmap[3])
+ m_border[bs].m_border_left = m_border[bs].m_pixmap[3]->size().width();
+ else
+ m_border[bs].m_border_left = 0;
+
+ if (m_border[bs].m_pixmap[5])
+ m_border[bs].m_border_right = m_border[bs].m_pixmap[5]->size().width();
+ else
+ m_border[bs].m_border_right = 0;
eDebug("recalced border size for %d: %d:%d %d:%d",
bs,
eDebug("recalced border size for %d: %d:%d %d:%d",
bs,