diff --git a/src/espeak-ng.c b/src/espeak-ng.c index 50c7e022..f60ecde1 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2006 to 2013 by Jonathan Duddington * email: jonsd@users.sourceforge.net - * Copyright (C) 2015 Reece H. Dunn + * Copyright (C) 2015-2016 Reece H. Dunn * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -590,10 +590,10 @@ int main(int argc, char **argv) espeak_ng_InitializePath(data_path); espeak_ng_STATUS result = espeak_ng_Initialize(); if (result != ENS_OK) { - if (result == ENE_READ_ERROR) - fprintf(stderr, "Failed to load espeak-data\n"); - else + if (result == ENE_VERSION_MISMATCH) fprintf(stderr, "Wrong version of espeak-data\n"); + else + fprintf(stderr, "Failed to load espeak-data\n"); exit(1); } diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c index 0bfa482e..41783895 100644 --- a/src/libespeak-ng/speak_lib.c +++ b/src/libespeak-ng/speak_lib.c @@ -635,12 +635,13 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length espeak_ng_InitializePath(path); espeak_ng_STATUS result = espeak_ng_Initialize(); if (result != ENS_OK) { - if (result == ENE_READ_ERROR) { + if (result == ENE_VERSION_MISMATCH) + fprintf(stderr, "Wrong version of espeak-data (expected 0x%x) at %s\n", version_phdata, path_home); + else { fprintf(stderr, "Failed to load espeak-data\n"); if ((options & espeakINITIALIZE_DONT_EXIT) == 0) exit(1); - } else - fprintf(stderr, "Wrong version of espeak-data (expected 0x%x) at %s\n", version_phdata, path_home); + } } switch (output_type) diff --git a/src/speak-ng.c b/src/speak-ng.c index 6531692a..6070f26d 100644 --- a/src/speak-ng.c +++ b/src/speak-ng.c @@ -577,10 +577,10 @@ int main(int argc, char **argv) espeak_ng_InitializePath(data_path); espeak_ng_STATUS result = espeak_ng_Initialize(); if (result != ENS_OK) { - if (result == ENE_READ_ERROR) - fprintf(stderr, "Failed to load espeak-data\n"); - else + if (result == ENE_VERSION_MISMATCH) fprintf(stderr, "Wrong version of espeak-data (expected 0x%x) at %s\n", version_phdata, path_home); + else + fprintf(stderr, "Failed to load espeak-data\n"); exit(1); }