From 7dea1b7b16de43fa4ce487aad889850cac6593c0 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Wed, 10 Jun 2015 00:38:31 -0700 Subject: [PATCH] MGR: Fix Mac-only bug since BOINC 7.3.0 which prevented showing exit confirmation dialog when selecting quit from menubar icon menu (task bar menu.) This bug was introduced when task bar icon handling was changed for wxWidgets 3.0. --- clientgui/BOINCTaskBar.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 66e6029b26..ee4f1d9b7d 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -290,10 +290,7 @@ void CTaskBarIcon::OnAbout(wxCommandEvent& WXUNUSED(event)) { void CTaskBarIcon::OnExit(wxCommandEvent& event) { wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnExit - Function Begin")); -#ifndef __WXMAC__ - if (wxGetApp().ConfirmExit()) -#endif - { + if (wxGetApp().ConfirmExit()) { wxCloseEvent eventClose; OnClose(eventClose); if (eventClose.GetSkipped()) event.Skip();