From 1e49b38db726b233632d81cefb4a1b35eb1dcbfe Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Sat, 30 Jul 2022 21:05:21 +0300 Subject: [PATCH 1/3] Back up old effects ini --- src/text_file_functions.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index c7cf8d0..f58ec4a 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -912,7 +912,13 @@ QStringList AOApplication::get_effects(QString p_char) // port legacy effects if (!l_effects_ini.contains("version/major") || l_effects_ini.value("version/major").toInt() < 2) { - AOUtils::migrateEffects(l_effects_ini); + QFile effects_old(i_filepath); + if (QFile::copy(i_filepath, i_filepath + ".old")) { + AOUtils::migrateEffects(l_effects_ini); + } + else { + qWarning() << "Could not back up old effects.ini during migraiton"; + } } QStringList l_group_list; From 31ecd7a007bb2d4a684fcaff7baafe1f7b4e6280 Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Sun, 31 Jul 2022 02:57:36 +0300 Subject: [PATCH 2/3] Implement Salanto warning wording suggestion --- src/text_file_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index f58ec4a..0a1375d 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -917,7 +917,7 @@ QStringList AOApplication::get_effects(QString p_char) AOUtils::migrateEffects(l_effects_ini); } else { - qWarning() << "Could not back up old effects.ini during migraiton"; + qWarning() << "Unable to copy effects.ini, skipping migration"; } } From 786e782220b092a5a4ec497700ce803f49bdeec9 Mon Sep 17 00:00:00 2001 From: Salanto <62221668+Salanto@users.noreply.github.com> Date: Sun, 31 Jul 2022 02:57:51 +0200 Subject: [PATCH 3/3] Punctuation. --- src/text_file_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 0a1375d..908bbce 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -917,7 +917,7 @@ QStringList AOApplication::get_effects(QString p_char) AOUtils::migrateEffects(l_effects_ini); } else { - qWarning() << "Unable to copy effects.ini, skipping migration"; + qWarning() << "Unable to copy effects.ini, skipping migration."; } }