Logo: fix poll() timeout or failed error when image is very large

Fix #554
fastfetch-cli · Sep 3, 2023 · 9500ca8 · 9500ca8
1 parent 4dfbc0f
commit 9500ca8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/common/io/io.h b/src/common/io/io.h
@@ -85,6 +85,8 @@ typedef enum FFPathType
 bool ffPathExists(const char* path, FFPathType pathType);
 bool ffPathExpandEnv(const char* in, FFstrbuf* out);
 
+#define FF_IO_TERM_RESP_WAIT_MS 100 // #554
+
 FF_C_SCANF(2, 3)
 const char* ffGetTerminalResponse(const char* request, const char* format, ...);
 

diff --git a/src/common/io/io_unix.c b/src/common/io/io_unix.c
@@ -146,7 +146,7 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
     fflush(stdout);
 
     //Give the terminal 35ms to respond
-    if(poll(&(struct pollfd) { .fd = STDIN_FILENO, .events = POLLIN }, 1, 35) <= 0)
+    if(poll(&(struct pollfd) { .fd = STDIN_FILENO, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
     {
         tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
         return "poll() timeout or failed";

diff --git a/src/common/io/io_windows.c b/src/common/io/io_windows.c
@@ -171,7 +171,7 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
 
     while (true)
     {
-        if (WaitForSingleObjectEx(hInput, 35, TRUE) != WAIT_OBJECT_0)
+        if (WaitForSingleObjectEx(hInput, FF_IO_TERM_RESP_WAIT_MS, TRUE) != WAIT_OBJECT_0)
         {
             SetConsoleMode(hInput, prev_mode);
             return "WaitForSingleObject() failed or timeout";