Merge with upstream master

2025-12-07 12:16:34 +01:00 · 2015-11-10 23:52:54 -05:00
parent 3cfda32b5e d16be574f3
commit fbd22003a8
23 changed files with 373 additions and 82 deletions
--- a/src/toxic.h
+++ b/src/toxic.h
@@ -88,6 +88,7 @@ typedef enum _FATAL_ERRS {
    FATALERR_PROXY = -10,           /* Tox network failed to init using a proxy */
    FATALERR_ENCRYPT = -11,         /* Data file encryption failure */
    FATALERR_TOX_INIT = -12,        /* Tox instance failed to initialize */
+    FATALERR_CURSES = -13,          /* Unrecoverable Ncurses error */
 } FATAL_ERRS;

 /* Fixes text color problem on some terminals.