From 4ea49166adba379e585309ea2e8a7561989a43c1 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Tue, 30 Mar 2004 13:27:13 +0000
Subject: INTEGRATION: CWS impress5ea1 (1.25.30); FILE MERGED 2004/03/12
 12:37:18 cl 1.25.30.1: #i14041# check for valid BasicIDEShell

---
 basctl/source/basicide/basobj3.cxx | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 9c91672a97cb..3d7a29107bf7 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basobj3.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: vg $ $Date: 2004-01-06 17:12:59 $
+ *  last change: $Author: rt $ $Date: 2004-03-30 14:27:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -849,13 +849,16 @@ void BasicIDE::BasicStopped( BOOL* pbAppWindowDisabled,
     // AppWait ?
     USHORT nWait = 0;
     BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
-    while ( pIDEShell->GetViewFrame()->GetWindow().IsWait() )
+    if( pIDEShell )
     {
-        pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
-        nWait++;
+        while ( pIDEShell->GetViewFrame()->GetWindow().IsWait() )
+        {
+            pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
+            nWait++;
+        }
+        if ( pnWaitCount )
+            *pnWaitCount = nWait;
     }
-    if ( pnWaitCount )
-        *pnWaitCount = nWait;
 
     // Interactive = FALSE ?
     if ( SFX_APP()->IsDispatcherLocked() )
-- 
cgit v1.2.3