From 4bf90f971719923bc1a822c19928f26a5b098fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20W=C5=82ostowski?= Date: Mon, 4 Dec 2017 19:29:57 +0100 Subject: [PATCH] WX_PROGRESS_REPORTER: fixed windows build error --- common/widgets/progress_reporter.cpp | 4 ++-- include/widgets/progress_reporter.h | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/common/widgets/progress_reporter.cpp b/common/widgets/progress_reporter.cpp index 3dd35c51fe..4f2a314dec 100644 --- a/common/widgets/progress_reporter.cpp +++ b/common/widgets/progress_reporter.cpp @@ -53,7 +53,7 @@ void PROGRESS_REPORTER::AdvancePhase( ) void PROGRESS_REPORTER::Report( const wxString& aMessage ) { std::lock_guard guard( m_lock ); - m_message = aMessage; + m_rptMessage = aMessage; updateUI(); } @@ -102,5 +102,5 @@ void WX_PROGRESS_REPORTER::updateUI() cur = 0; SetRange( 1000 ); - Update( cur, m_message ); + Update( cur, m_rptMessage ); } diff --git a/include/widgets/progress_reporter.h b/include/widgets/progress_reporter.h index e76813f5a9..d7c31c632b 100644 --- a/include/widgets/progress_reporter.h +++ b/include/widgets/progress_reporter.h @@ -47,9 +47,11 @@ class PROGRESS_REPORTER int currentProgress() const; virtual void updateUI() = 0; - wxString m_message; - int m_phase, m_numPhases; - int m_progress, m_maxProgress; + wxString m_rptMessage; + int m_phase; + int m_numPhases; + int m_progress; + int m_maxProgress; std::mutex m_lock; };