From 2e5107a4ec39a66bf7ffd521dd0c598afb84fc45 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Thu, 17 Jul 2008 10:00:43 +0000 Subject: [PATCH] MGR: Code which tests for reboot required should be Windows-only svn path=/trunk/boinc/; revision=15627 --- checkin_notes | 6 ++++++ clientgui/BOINCGUIApp.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index dc8721714d..c1b29bdbc2 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5832,3 +5832,9 @@ Rom 16 July 2008 win_build/installerv2/ BOINC.ism BOINCx64.ism + +Charlie 17 July 2008 + - MGR: Code which tests for reboot required should be Windows-only. + + clientgui/ + BOINCGUIApp.cpp diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index c805a63dc4..d7e9ea0013 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -324,7 +324,7 @@ bool CBOINCGUIApp::OnInit() { m_pConfig->Read(wxT("Skin"), m_pSkinManager->GetDefaultSkinName()) ); - +#ifdef __WXMSW__ // Perform any last minute checks that should keep the manager // from starting up. wxString strRebootPendingFile = @@ -343,7 +343,7 @@ bool CBOINCGUIApp::OnInit() { dialog.ShowModal(); return false; } - +#endif // Initialize the main document m_pDocument = new CMainDocument();