From a8f37cdeb4ac560d6a6c5e647557268b0f84ac52 Mon Sep 17 00:00:00 2001 From: sin Date: Mon, 22 Sep 2014 12:26:02 +0100 Subject: Allow a client with encrypted support to load non-encrypt datafiles --- ratox.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ratox.c') diff --git a/ratox.c b/ratox.c index bbff027..5d7c849 100644 --- a/ratox.c +++ b/ratox.c @@ -605,10 +605,15 @@ dataload(void) exit(EXIT_FAILURE); } - if (tox_is_data_encrypted(data) ^ encryptsave) { - fprintf(stderr, "Ensure %s matches your encryption configuration\n", - DATAFILE); - exit(EXIT_FAILURE); + if (encryptsave == 1) { + if (tox_is_data_encrypted(data) == 0) + encryptsave = 0; + } else { + if (tox_is_data_encrypted(data) == 1) { + fprintf(stderr, "Unable to load %s, it is encrypted\n", + DATAFILE); + exit(EXIT_FAILURE); + } } if (encryptsave == 1) { -- cgit v1.2.3