X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=2f89142da1e7082ec467fb2fcf63661e03850454;hb=d6b15c14f164e7150ffcaed86e8aa79795b2d89a;hp=a8a34b5661f44df010913be92a2415e574464b6b;hpb=8fd8a78d262322662183a34712a65d6e6d044c8b;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index a8a34b5..2f89142 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -605,7 +605,6 @@ sub parseconfirmations {
 			}
 
 			given(shift @etas){
-				$mission{name} .= " $_";
 				when(/$missionetare/sx){
 					$mission{tick} = $3;
 					$mission{eta} = $1 + $+{eta};
@@ -656,7 +655,7 @@ sub findDuplicateFleet : Private {
 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 tick > $6 - 6
+	AND mission = $3 AND amount = $4 AND (mission <> 'Full fleet' OR 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}