From 18b4ebcc17bcfa79a97616c14692a2723aa7800b Mon Sep 17 00:00:00 2001 From: qu1ck Date: Tue, 23 Nov 2021 14:49:40 -0800 Subject: [PATCH] Skip migrating installed_packages.json --- common/settings/settings_manager.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/settings/settings_manager.cpp b/common/settings/settings_manager.cpp index ebcfadba58..917777d856 100644 --- a/common/settings/settings_manager.cpp +++ b/common/settings/settings_manager.cpp @@ -430,6 +430,10 @@ public: return wxDIR_CONTINUE; } + // Skip migrating PCM installed packages as packages themselves are not moved + if( file.GetFullName() == wxT( "installed_packages.json" ) ) + return wxDIR_CONTINUE; + // Don't migrate hotkeys config files; we don't have a reasonable migration handler for them // and so there is no way to resolve conflicts at the moment if( file.GetExt() == wxT( "hotkeys" ) )