Merge pull request #184 from simon987/dev

v2.11.1

sist2-vue/src/components/MimePicker.vue

@@ -43,7 +43,7 @@ export default {
   },
   methods: {
     handleTreeClick(node, e) {
-      if (e === "indeterminate" || e === "collapsed") {
+      if (e === "indeterminate" || e === "collapsed" || e === 'rendered' || e === "focused") {
         return;
       }
 

sist2-vue/src/components/TagPicker.vue

@@ -162,7 +162,7 @@ export default {
       });
     },
     handleTreeClick(node, e) {
-      if (e === "indeterminate" || e === "collapsed" || e === 'rendered') {
+      if (e === "indeterminate" || e === "collapsed" || e === 'rendered' || e === "focused") {
         return;
       }
 

src/ctx.c

@@ -2,6 +2,8 @@
 
 ScanCtx_t ScanCtx = {
         .stat_index_size = 0,
+        .dbg_current_files = NULL,
+        .pool = NULL
 };
 WebCtx_t WebCtx;
 IndexCtx_t IndexCtx;

src/main.c

@@ -43,30 +43,38 @@ void sig_handler(int signum) {
     LOG_ERROR("*SIGNAL HANDLER*", "=============================================\n\n");
     LOG_ERRORF("*SIGNAL HANDLER*", "Uh oh! Caught fatal signal: %s", strsignal(signum));
 
-    GHashTableIter iter;
-    g_hash_table_iter_init(&iter, ScanCtx.dbg_current_files);
+    if (ScanCtx.dbg_current_files != NULL) {
+        GHashTableIter iter;
+        g_hash_table_iter_init(&iter, ScanCtx.dbg_current_files);
 
-    void *key;
-    void *value;
-    while (g_hash_table_iter_next(&iter, &key, &value)) {
-        parse_job_t *job = value;
+        void *key;
+        void *value;
+        while (g_hash_table_iter_next(&iter, &key, &value)) {
+            parse_job_t *job = value;
 
-        if (isatty(STDERR_FILENO)) {
-            LOG_DEBUGF(
-                    "*SIGNAL HANDLER*",
-                    "Thread \033[%dm[%04llX]\033[0m was working on job '%s'",
-                    31 + ((unsigned int) key) % 7, key, job->filepath
-            );
-        } else {
-            LOG_DEBUGF(
-                    "*SIGNAL HANDLER*",
-                    "THREAD [%04llX] was working on job %s",
-                    key, job->filepath
-            );
+            if (isatty(STDERR_FILENO)) {
+                LOG_DEBUGF(
+                        "*SIGNAL HANDLER*",
+                        "Thread \033[%dm[%04llX]\033[0m was working on job '%s'",
+                        31 + ((unsigned int) key) % 7, key, job->filepath
+                );
+            } else {
+                LOG_DEBUGF(
+                        "*SIGNAL HANDLER*",
+                        "THREAD [%04llX] was working on job %s",
+                        key, job->filepath
+                );
+            }
         }
     }
 
-    tpool_dump_debug_info(ScanCtx.pool);
+    if (ScanCtx.pool != NULL) {
+        tpool_dump_debug_info(ScanCtx.pool);
+    }
+
+    if (IndexCtx.pool != NULL) {
+        tpool_dump_debug_info(IndexCtx.pool);
+    }
 
     LOG_INFO(
             "*SIGNAL HANDLER*",

src/sist.h

@@ -49,7 +49,7 @@
 #include <ctype.h>
 #include "git_hash.h"
 
-#define VERSION "2.11.0"
+#define VERSION "2.11.1"
 static const char *const Version = VERSION;
 
 #ifndef SIST_PLATFORM