diff options
| author | Eike Rathke <erack@redhat.com> | 2012-07-16 16:59:00 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:28 +0200 |
| commit | bf4c5e3454874c85cf15973fced9a83c0a95913d (patch) | |
| tree | 73ea62c3c13e9b3c9bf58d1e5bc026a3f23155a0 | |
| parent | f5ee5d794f0c7500755df68b2b57d56e4566c9c1 (diff) | |
tubes: check mpConference before using it
Change-Id: I8949ae1f43439465701244b501f6779debc34565
| -rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index e70021bf9c73..27d8c9363aa7 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() |