[Libreoffice-commits] .: Branch 'libreoffice-3-4-0' - desktop/source

[Kohei Yoshida]

 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6cb0ca9db2ce141b210c4b5dfabe4ebab6e82952
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri May 20 16:41:33 2011 +0300

    Sanity checks that fix crash (fdo#36495)
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Fridrich Strba <fridrich.strba at graduateinstitute.ch>
    Signed-off-by: Kohei Yoshida <kyoshida at novell.com>

diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 8b73e6b..7040822 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1263,11 +1263,15 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
             }
             case DISABLED_UPDATE:
             {
-                bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo );
+                if ( !m_disabledUpdates.empty() )
+                    bInserted = showDescription( m_disabledUpdates[pos].aUpdateInfo );
 
                 if ( p->m_bIgnored )
                     b.append( m_ignoredUpdate );
 
+                if ( m_disabledUpdates.empty() )
+                    break;
+
                 UpdateDialog::DisabledUpdate & data = m_disabledUpdates[ pos ];
                 if (data.unsatisfiedDependencies.getLength() != 0)
                 {