From 6d2b90ac9f29f9badbeb661133b6d0e42695269e Mon Sep 17 00:00:00 2001
From: jakob <jakob@memeware.net>
Date: Thu, 18 May 2017 21:37:28 -0400
Subject: [PATCH] Error reporting on failure of invoke_autoruns and solved
 issue with call to Py_FinalizeEx

---
 src/api.c        | 12 +++++++++---
 src/python_api.c |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/api.c b/src/api.c
index fbb0488..7859b5e 100644
--- a/src/api.c
+++ b/src/api.c
@@ -160,13 +160,16 @@ void cmd_run(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv)[MAX
 void invoke_autoruns(WINDOW *window, ToxWindow *self)
 {
     struct dirent *dir;
-    char    abspath_buf[PATH_MAX + 1];
+    char    abspath_buf[PATH_MAX + 1], err_buf[PATH_MAX + 1];
     size_t  path_len;
     DIR    *d = opendir(user_settings->autorun_path);
     FILE   *fp;
 
-    if (d == NULL)
+    if (d == NULL) {
+        snprintf(err_buf, PATH_MAX + 1, "Autorun path does not exist: %s", user_settings->autorun_path);
+        api_display(err_buf);
         return;
+    }
 
     cur_window  = window;
     self_window = self;
@@ -178,8 +181,11 @@ void invoke_autoruns(WINDOW *window, ToxWindow *self)
             snprintf(abspath_buf, PATH_MAX + 1, "%s%s", user_settings->autorun_path, dir->d_name);
             fp = fopen(abspath_buf, "r");
 
-            if (fp == NULL)
+            if (fp == NULL) {
+                snprintf(err_buf, PATH_MAX + 1, "Invalid path: %s", abspath_buf);
+                api_display(err_buf);
                 continue;
+            }
 
             run_python(fp, abspath_buf);
             fclose(fp);
diff --git a/src/python_api.c b/src/python_api.c
index 6f1fa3d..9c721ba 100644
--- a/src/python_api.c
+++ b/src/python_api.c
@@ -250,7 +250,7 @@ void terminate_python(void)
         free(old);
     }
 
-    Py_FinalizeEx();
+    Py_Finalize();
 }
 
 void init_python(Tox *m)