[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source

[Eike Rathke]

 sc/source/ui/collab/sendfunc.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 4dac498c9ccb502ec0fd534c89b32f9d8e188a55
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Jul 16 16:59:00 2012 +0200

    tubes: check mpConference before using it
    
    Change-Id: I8949ae1f43439465701244b501f6779debc34565

diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index e70021b..27d8c93 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -275,15 +275,17 @@ ScDocFuncSend::ScDocFuncSend( ScDocShell& rDocSh, ScDocFuncRecv *pDirect )
 ScDocFuncSend::~ScDocFuncSend()
 {
     fprintf( stderr, "Sender destroyed !\n" );
-    mpConference->close();
+    if (mpConference)
+        mpConference->close();
     delete mpDirect;
 }
 
 void ScDocFuncSend::SetCollaboration( TeleConference* pConference )
 {
     mpConference = pConference;
-    mpConference->sigPacketReceived.connect( boost::bind(
-                &ScDocFuncRecv::packetReceived, mpDirect, _1 ) );
+    if (mpConference)
+        mpConference->sigPacketReceived.connect( boost::bind(
+                    &ScDocFuncRecv::packetReceived, mpDirect, _1 ) );
 }
 
 TeleConference* ScDocFuncSend::GetConference()