From f3e6fd50ced7dc8117af42047747530e97a8bbd3 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 19 Sep 2008 07:55:38 +0000 Subject: [PATCH] Mgr: Fix a rare crash bug in CTaskBarIcon::OnMouseMove() svn path=/trunk/boinc/; revision=16026 --- checkin_notes | 3 +++ clientgui/BOINCTaskBar.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 8c2e2deae6..eb75a05b67 100644 --- a/checkin_notes +++ b/checkin_notes @@ -7563,8 +7563,11 @@ Charlie 19 Sep 2008 recursion and repeatedly posting the same RPC requests from timer routines while waitung for the first one to complete, so ignore timer events during that dialog. + Mgr: Fix a rare crash bug in CTaskBarIcon::OnMouseMove() if it is + called when exiting Manager after CmainDocument deleted. clientgui/ BOINCBaseFrame.cpp + BOINCTaskBar.cpp MainDocument.cpp,.h sg_BoincSimpleGUI.cpp diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 18c660dba7..b605add5fd 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -310,8 +310,7 @@ void CTaskBarIcon::OnMouseMove(wxTaskBarIconEvent& WXUNUSED(event)) { wxInt32 iIndex = 0; CC_STATUS status; - wxASSERT(pDoc); - wxASSERT(wxDynamicCast(pDoc, CMainDocument)); + if (!pDoc) return; if (pDoc->IsConnected()) { pDoc->GetConnectedComputerName(strMachineName);