@@ -234,9 +234,13 @@ private IReadOnlyList<IPackage> _findPackages(string query, bool SecondAttempt)
234234                if  ( ! task . Wait ( TimeSpan . FromSeconds ( PackageListingTaskTimeout ) ) ) 
235235                { 
236236                    if  ( ! Settings . Get ( Settings . K . DisableTimeoutOnPackageListingTasks ) ) 
237+                     { 
238+                         CoreTools . FinalizeDangerousTask ( task ) ; 
237239                        throw  new  TimeoutException ( $ "Task _getInstalledPackages for manager { Name }  did not finish after "  + 
238240                                                   $ "{ PackageListingTaskTimeout }  seconds, aborting.  You may disable "  + 
239241                                                   $ "timeouts from UniGetUI Advanced Settings") ; 
242+                     } 
243+ 
240244                    task . Wait ( ) ; 
241245                } 
242246
@@ -273,15 +277,19 @@ private IReadOnlyList<IPackage> _getAvailableUpdates(bool SecondAttempt)
273277            if  ( ! IsReady ( ) )  {  Logger . Warn ( $ "Manager { Name }  is disabled but yet GetAvailableUpdates was called") ;  return  [ ] ;  } 
274278            try 
275279            { 
276-                 Task . Run ( RefreshPackageIndexes ) . Wait ( TimeSpan . FromSeconds ( 60 ) ) ; 
280+                 Task . Run ( RefreshPackageIndexes ) . Wait ( TimeSpan . FromSeconds ( PackageListingTaskTimeout ) ) ; 
277281
278282                var  task  =  Task . Run ( GetAvailableUpdates_UnSafe ) ; 
279283                if  ( ! task . Wait ( TimeSpan . FromSeconds ( PackageListingTaskTimeout ) ) ) 
280284                { 
281285                    if  ( ! Settings . Get ( Settings . K . DisableTimeoutOnPackageListingTasks ) ) 
286+                     { 
287+                         CoreTools . FinalizeDangerousTask ( task ) ; 
282288                        throw  new  TimeoutException ( $ "Task _getInstalledPackages for manager { Name }  did not finish after "  + 
283289                                                   $ "{ PackageListingTaskTimeout }  seconds, aborting.  You may disable "  + 
284290                                                   $ "timeouts from UniGetUI Advanced Settings") ; 
291+                     } 
292+ 
285293                    task . Wait ( ) ; 
286294                } 
287295
@@ -322,9 +330,13 @@ private IReadOnlyList<IPackage> _getInstalledPackages(bool SecondAttempt)
322330                if  ( ! task . Wait ( TimeSpan . FromSeconds ( PackageListingTaskTimeout ) ) ) 
323331                { 
324332                    if  ( ! Settings . Get ( Settings . K . DisableTimeoutOnPackageListingTasks ) ) 
333+                     { 
334+                         CoreTools . FinalizeDangerousTask ( task ) ; 
325335                        throw  new  TimeoutException ( $ "Task _getInstalledPackages for manager { Name }  did not finish after "  + 
326336                                                   $ "{ PackageListingTaskTimeout }  seconds, aborting.  You may disable "  + 
327337                                                   $ "timeouts from UniGetUI Advanced Settings") ; 
338+                     } 
339+ 
328340                    task . Wait ( ) ; 
329341                } 
330342
0 commit comments