summaryrefslogtreecommitdiff
path: root/desktop/source/deployment
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-12-16 13:53:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-12-16 13:55:02 +0100
commit72fcd182fd89aee7eea8e42cba777a5dae1ca4ef (patch)
tree149288c21001f388850948f7c93d54e6051c3cd8 /desktop/source/deployment
parent0fe50b05de83098864d1067563844ae7c5ffaa26 (diff)
m_bHasActive must be false after last visible entry is removed
...otherwise, ExtensionBox_Impl::RecalcAll would crash in CalcActiveHeight(-1). Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850 (cherry picked from commit 661f7bdefc8215f742951727b93395d47293cf0e)
Diffstat (limited to 'desktop/source/deployment')
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3b9a3feb2c06..dd10ae00dfad 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries()
if ( nPos < m_nActive )
m_nActive -= 1;
else if ( ( nPos == m_nActive ) && ( nPos == (long) m_vEntries.size() - 1 ) )
+ {
m_nActive -= 1;
+ if (m_nActive == -1)
+ {
+ m_bHasActive = false;
+ }
+ }
m_vRemovedEntries.push_back( *iIndex );
m_vEntries.erase( iIndex );
iIndex = m_vEntries.begin() + nPos;