X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=bin%2Fsetbg;h=e36a1a7ca2d7c32b23b9ba4579e3eb4903bb623a;hb=e0126eea04c6d0de501af304c30d0276d78799bb;hp=93a339a0f2ebb899a1e968620934d77d30ebafdf;hpb=59e4b094ca914ea2ff06f07da91a6c201cc7e466;p=clearscm.git

diff --git a/bin/setbg b/bin/setbg
index 93a339a..e36a1a7 100755
--- a/bin/setbg
+++ b/bin/setbg
@@ -237,17 +237,27 @@ truncate "$ENV{HOME}/.$FindBin::Script.hist", 0;
 
 EnterDaemonMode unless defined $DB::OUT;
 
+my $pickNewImages = 1;
+
 while () {
-  my $bgimage   = escapeHTML ($images[int (rand $#images)]);
-  my $lockimage = escapeHTML ($images[int (rand $#images)]);
+  my ($bgimage, $lockimage);
+
+  if ($pickNewImages) {
+    $bgimage   = escapeHTML ($images[int (rand $#images)]);
+    $lockimage = escapeHTML ($images[int (rand $#images)]);
+  } # if
 
   my $monitorIsOn;
 
   my ($status, @output) = Execute("xset q | grep Monitor | awk '{print \$3}'");
 
   if ($status or $output[0] eq 'Off') {
-    writeHistory ":Monitor off, not setting background to $bgimage";
+    writeHistory ":Monitor off, not setting background to $bgimage - will keep trying";
+
+    $pickNewImages = 0;
   } else {
+    $pickNewImages = 1;
+
     my $cmd = "$setbg $setbgOpts$bgimage\" 2> /dev/null";
 
     ($status, @output) = Execute $cmd;