From cbb2c187bdff1a85ef4a652d1234517c22a60fe6 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 21 Jul 2024 16:38:46 +0100 Subject: [PATCH] Fix scoping of lock. (cherry picked from commit d5c7ac50659298409805e5e4e29add00b1489089) --- common/lib_table_base.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/common/lib_table_base.cpp b/common/lib_table_base.cpp index d4f9d9329e..a4af4a6c10 100644 --- a/common/lib_table_base.cpp +++ b/common/lib_table_base.cpp @@ -199,16 +199,7 @@ LIB_TABLE_ROW* LIB_TABLE::findRow( const wxString& aNickName, bool aCheckIfEnabl do { - try - { - std::shared_lock lock( cur->m_mutex ); - } - catch( std::system_error& e ) - { - wxASSERT_MSG( false, wxString::Format( wxS( "Failed to lock lib table mutex: %s" ), - e.what() ) ); - continue; - } + std::shared_lock lock( cur->m_mutex ); if( cur->m_rowsMap.count( aNickName ) ) row = &*cur->m_rowsMap.at( aNickName );