]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Mirror ippfind timeout fix from 2.4.x.
authorMichael R Sweet <msweet@msweet.org>
Mon, 7 Apr 2025 14:30:52 +0000 (10:30 -0400)
committerMichael R Sweet <msweet@msweet.org>
Mon, 7 Apr 2025 14:30:52 +0000 (10:30 -0400)
tools/ippfind.c

index 64c07f90ecfbe7af6c3eb47c1b74a47e23af8546..73c43c828892b6a90bad9d52e8625944a260e6bc 100644 (file)
@@ -1122,7 +1122,7 @@ main(int  argc,                           // I - Number of command-line args
     if (getenv("IPPFIND_DEBUG"))
       fprintf(stderr, "STATUS processed=%u, resolved=%u, count=%u\n", (unsigned)processed, (unsigned)resolved, (unsigned)count);
 
-    if (processed > 0 && (processed == cupsArrayGetCount(services.services) || (cupsGetClock() - last_update) >= 2.5) && bonjour_timeout <= 1.0)
+    if (bonjour_timeout <= 1.0 && cupsGetClock() >= 2.5 && (processed == cupsArrayGetCount(services.services) || (cupsGetClock() - last_update) >= 1.0))
       break;
 
     // Give the browsers/resolvers some time...