ratox

commit e7fb3a49412474b913134b819c4c049f5e1c88fc
parent 1ae2de113e476260ccd318ece1c0aa6bed7b452d
Author: sin <sin@2f30.org>
Date:   Mon, 22 Sep 2014 15:22:23 +0100

Print message before password prompt

Diffstat:
M
ratox.c
 | 
6
++----

1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/ratox.c b/ratox.c
@@ -579,11 +579,10 @@ dataload(void)
 	}
 
 	if (tox_is_data_encrypted(data) == 1) {
+		if (encryptdatafile == 0)
+			printout("%s is encrypted, but saving in plain format\n", DATAFILE);
 		while (readpass("Passphrase: ") < 0 ||
 		       tox_encrypted_load(tox, data, sz, passphrase, pplen) < 0);
-		if (encryptdatafile == 0) {
-			printout("%s is encrypted, but saving in plain format\n", DATAFILE);
-		}
 	} else {
 		if (tox_load(tox, data, sz) < 0) {
 			fprintf(stderr, "tox_load() failed\n");
@@ -593,7 +592,6 @@ dataload(void)
 			printout("%s is not encrypted, but saving in encrypted format\n", DATAFILE);
 			while (readpass("New passphrase: ") < 0);
 		}
-
 	}
 
 	free(data);