From 4c81bac9e3f39b2578ec207a6bd307bf0ddf5bd7 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 25 Feb 2022 18:21:46 +0100 Subject: [PATCH] Eeschema: ensure ERC exclusions list is up to date before saving it in *.kicad_pro Fixes #10339 https://gitlab.com/kicad/code/kicad/issues/10339 --- eeschema/eeschema_config.cpp | 2 +- eeschema/files-io.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 56a8d7ad24..f8887f2c2b 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -161,7 +161,7 @@ void SCH_EDIT_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg ) void SCH_BASE_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg ) { - wxCHECK_RET( aCfg, "Call to SCH_BASE_FRAME::SaveSettings with null settings" ); + wxCHECK_RET( aCfg, "Call to SCH_BASE_FRAME::LoadSettings with null settings" ); EDA_DRAW_FRAME::LoadSettings( aCfg ); diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 5c14326f0c..03848d7d4f 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -4,7 +4,7 @@ * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2013 Wayne Stambaugh * Copyright (C) 2013 CERN (www.cern.ch) - * Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1080,6 +1080,7 @@ bool SCH_EDIT_FRAME::SaveProject( bool aSaveAs ) } else { + RecordERCExclusions(); // ensure ERC Exclusions list is up to date GetSettingsManager()->SaveProject(); }