bugfix for ag_stop and ag_restart

1 files changed, 15 insertions, 28 deletions

diff --git a/scripts/xdcc_autoget.pl b/scripts/xdcc_autoget.pl
index 5d77ef7..c7489a8 100644
--- a/scripts/xdcc_autoget.pl
+++ b/scripts/xdcc_autoget.pl
@@ -489,6 +489,11 @@ sub ag_closedcc
 
 			$reqpackflag[$botcounter] = 0;
 			
+			if (!$skipunfinishedflag[$botcounter])
+			{
+				$filename =~ tr/[ ']/[__]/;
+				@filenames = grep { $_ ne $filename } @filenames;		#remove the file from the list of files being transferred
+ 			}
 			&ag_remtimeouts($botcounter);
 					
 			if ($dcc->{'skipped'} == $dcc->{'size'})
@@ -500,8 +505,6 @@ sub ag_closedcc
 			{
 				if (!$skipunfinishedflag[$botcounter])
 				{
-					$filename =~ tr/[ ']/[__]/;
-					@filenames = grep { $_ ne $filename } @filenames;		#remove the file from the list of files being transferred
 	 				ag_addfinished($dcc->{'arg'}, $botcounter);
 	 			}
 				$skipunfinishedflag[$botcounter] = 0;				#reset any skip flags
@@ -751,17 +754,17 @@ sub ag_stop
 	{
 		&ag_remtimeouts($botcounter);	#stop any skips from happening
 		ag_message("msg $bot $cancelprefix");
-		$getmsgflag[$botcounter] = 0;
 		$botcounter++;
-		@msgflag = ();
-		@reqpackflag = ();
-		@downloadflag = ();
-		@skipunfinishedflag = ();
-		@termcounter = ();
-		@packcounter = ();
-		@episode = ();
-		@filenames = ();
 	}
+	@getmsgflag = ();
+	@msgflag = ();
+	@reqpackflag = ();
+	@downloadflag = ();
+	@skipunfinishedflag = ();
+	@termcounter = ();
+	@packcounter = ();
+	@episode = ();
+	@filenames = ();
 
 	if($runningflag == 1)
 	{
@@ -780,23 +783,7 @@ sub ag_restart
 	$statusbarmessage = "No Connection";
 	Irssi::signal_remove("dcc request", "ag_opendcc");
 	Irssi::signal_remove("message irc notice", "ag_getmsg");
-	
-	my $botcounter = 0;
-	foreach my $bot (@bots)
-	{
-		$getmsgflag[$botcounter] = 0;
-		&ag_remtimeouts($botcounter);
-		ag_message("msg $bot $cancelprefix");
-		$botcounter++;
-	}
-
-	if($runningflag == 1)
-	{
-		$runningflag = 0;
-	}
-	@msgflag = ();
-	@reqpackflag = ();
-	@downloadflag = ();
+	&ag_stop();
 	Irssi::signal_add("server connected", "ag_initserver");
 }
 sub ag_reset