From 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 8 May 2018 20:40:49 +0200 Subject: merge from master --- plugins/DbEditorPP/src/exportimport.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/DbEditorPP/src/exportimport.cpp') diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp index b7a404c980..425abae95a 100644 --- a/plugins/DbEditorPP/src/exportimport.cpp +++ b/plugins/DbEditorPP/src/exportimport.cpp @@ -390,7 +390,8 @@ void importSettings(MCONTACT hContact, char *utf8) memmove(pstr + 1, pstr + 2, mir_strlen(pstr + 2) + 1); } } - // fall through - write it to database + __fallthrough; // write it to database + case 'u': case 'U': db_set_utf(hContact, module, setting, (end + 2)); -- cgit v1.2.3