haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not set wxSetAssertHandler on non-debug builds. 

Fixes lp:1809622

https://bugs.launchpad.net/kicad/+bug/1809622
This commit is contained in:
Wayne Stambaugh 2019-01-15 09:29:33 -05:00
parent e7fa02a9f0
commit 69d90a4e84
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/common.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2014-2018 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2014-2018 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -56,7 +56,8 @@ using KIGFX::COLOR4D;
COLOR4D g_GhostColor; COLOR4D g_GhostColor;
#ifdef _WIN32
#if defined( _WIN32 ) && defined( DEBUG )
// a wxAssertHandler_t function to filter wxWidgets alert messages when reading/writing a file // a wxAssertHandler_t function to filter wxWidgets alert messages when reading/writing a file
// when switching the locale to LC_NUMERIC, "C" // when switching the locale to LC_NUMERIC, "C"
// It is used in class LOCALE_IO to hide a useless (in kicad) wxWidgets alert message // It is used in class LOCALE_IO to hide a useless (in kicad) wxWidgets alert message
@ -69,7 +70,9 @@ void KiAssertFilter( const wxString &file, int line,
} }
#endif #endif
std::atomic<unsigned int> LOCALE_IO::m_c_count(0);
std::atomic<unsigned int> LOCALE_IO::m_c_count( 0 );
// Note on Windows, setlocale( LC_NUMERIC, "C" ) works fine to read/write // Note on Windows, setlocale( LC_NUMERIC, "C" ) works fine to read/write
// files with floating point numbers, but generates a overzealous wx alert // files with floating point numbers, but generates a overzealous wx alert
@ -83,7 +86,7 @@ LOCALE_IO::LOCALE_IO()
{ {
// Store the user locale name, to restore this locale later, in dtor // Store the user locale name, to restore this locale later, in dtor
m_user_locale = setlocale( LC_NUMERIC, nullptr ); m_user_locale = setlocale( LC_NUMERIC, nullptr );
#ifdef _WIN32 #if defined( _WIN32 ) && defined( DEBUG )
// Disable wxWidgets alerts // Disable wxWidgets alerts
wxSetAssertHandler( KiAssertFilter ); wxSetAssertHandler( KiAssertFilter );
#endif #endif
@ -100,7 +103,7 @@ LOCALE_IO::~LOCALE_IO()
{ {
// revert to the user locale // revert to the user locale
setlocale( LC_NUMERIC, m_user_locale.c_str() ); setlocale( LC_NUMERIC, m_user_locale.c_str() );
#ifdef _WIN32 #if defined( _WIN32 ) && defined( DEBUG )
// Enaable wxWidgets alerts // Enaable wxWidgets alerts
wxSetDefaultAssertHandler(); wxSetDefaultAssertHandler();
#endif #endif