From 95cfd7bb5173581eda52b1d920840da10fa3a333 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Tue, 10 Aug 2010 23:19:54 +0200
Subject: [PATCH] Allow new full fleets if the old one is a few ticks old

---
 lib/NDWeb.pm                    | 2 ++
 lib/NDWeb/Controller/Members.pm | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/NDWeb.pm b/lib/NDWeb.pm
index 51c5e7f..b72d765 100644
--- a/lib/NDWeb.pm
+++ b/lib/NDWeb.pm
@@ -47,6 +47,8 @@ sub signal_bots {
 	system 'killall','-USR1', 'ndbot.pl';
 }
 
+#$SIG{__WARN__} = sub { NDWeb->log->warn(@_); };
+
 # Configure the application.
 #
 # Note that settings in ndweb.conf (or other external
diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index cd82bd9..a7f6fb3 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -630,8 +630,9 @@ sub findDuplicateFleet : Private {
 	my $findfleet = $dbh->prepare(q{
 SELECT fid FROM fleets f
 	LEFT JOIN launch_confirmations lc USING (fid)
-WHERE f.pid = (SELECT pid FROM users WHERE uid = $1) AND mission = $3 AND amount = $4 AND
-	COALESCE(uid = $1 AND num = $2 AND lc.pid = $5 AND landing_tick = $6, TRUE)
+WHERE f.pid = (SELECT pid FROM users WHERE uid = $1)
+	AND mission = $3 AND amount = $4 AND tick > $6 - 6
+	AND COALESCE(uid = $1 AND num = $2 AND lc.pid = $5 AND landing_tick = $6, TRUE)
 		});
 	my $fid = $dbh->selectrow_array($findfleet,undef,$c->user->id,$m->{num}
 		,$m->{mission},$m->{amount}, $m->{pid}, $m->{tick});
-- 
2.39.2