Merge branch '1.8.0' into 1.8.1

[monky] / src / conky.c

diff --git a/src/conky.c b/src/conky.c
index 8e29c22..456142a 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -5619,7 +5619,7 @@ void initialisation(int argc, char **argv) {
 
        while (1) {
                int c = getopt_long(argc, argv, getopt_string, longopts, NULL);
-               int startup_pause;
+               static int startup_pause = 0;
 
                if (c == -1) {
                        break;