[Libreoffice-commits] .: Branch 'libreoffice-3-6' - basctl/source

[Michael Meeks]

 basctl/source/basicide/basides1.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 37c1c9c4ffff46264ba0f5a56ed11d24b9e0fabb
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jul 3 13:09:28 2012 +0100

    fdo#51577 - fix incremental search / buffer switching hang/crash

diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index cb18b10..24c7884 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -231,9 +231,12 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
                                 }
                                 if ( pWin && ( pWin != pCurWin ) )
                                 {
-                                    ++it;
+                                    if ( it != aIDEWindowTable.end() )
+                                        ++it;
                                     if ( it != aIDEWindowTable.end() )
                                         pWin = it->second;
+                                    else
+                                        pWin = 0;
                                 }
                                 else
                                     pWin = 0;