From 39c830435c68c12b01f5649440d6f9d1aa4a25ef Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 6 Jul 2019 14:48:53 +0200 Subject: [PATCH] Fix a bug created by commit ea0edaba. --- common/tool/tool_manager.cpp | 4 ++-- include/tool/tool_event.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/tool/tool_manager.cpp b/common/tool/tool_manager.cpp index 7323d8d653..6e606ba398 100644 --- a/common/tool/tool_manager.cpp +++ b/common/tool/tool_manager.cpp @@ -446,7 +446,7 @@ void TOOL_MANAGER::InitTools() if( !tool->Init() ) { - wxMessageBox( wxString::Format( "Initialization of tool \"%s\" failed", + wxMessageBox( wxString::Format( "Initialization of tool \"%s\" failed", tool->GetName() ) ); // Unregister the tool @@ -462,7 +462,7 @@ void TOOL_MANAGER::InitTools() } m_actionMgr->UpdateHotKeys( true ); - + ResetTools( TOOL_BASE::RUN ); } diff --git a/include/tool/tool_event.h b/include/tool/tool_event.h index 4e78818759..6fa73ba77f 100644 --- a/include/tool/tool_event.h +++ b/include/tool/tool_event.h @@ -300,7 +300,7 @@ public: bool IsMouseAction() const { - return m_actions && TA_MOUSE; + return ( m_actions & TA_MOUSE ); } bool IsCancel() const