Merge branch 'public/9.0' into public/9.1

LMS-Community · Jan 31, 2025 · 4a99eaf · 4a99eaf
2 parents a910a27 + fe12f0a
commit 4a99eaf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Slim/Web/Settings/Server/Wizard.pm b/Slim/Web/Settings/Server/Wizard.pm
@@ -211,8 +211,6 @@ sub handler {
 	$paramRef->{pluginsJSON} = to_json($paramRef->{plugins});
 
 	$serverPrefs->set('dontTriggerScanOnPrefChange', $scanOnChange) if $scanOnChange;
-	Slim::Music::Import->doQueueScanTasks(0);
-	Slim::Music::Import->nextScanTask();
 
 	# if the wizard has been run for the first time, redirect to the main we page
 	if ($paramRef->{firstTimeRunCompleted}) {
@@ -221,6 +219,9 @@ sub handler {
 
 		if (Slim::Utils::PluginDownloader->downloading) {
 			$finalizeCb = sub {
+				Slim::Music::Import->doQueueScanTasks(0);
+				Slim::Music::Import->nextScanTask();
+
 				Slim::Web::HTTP::filltemplatefile($class->page, $paramRef);
 				$pageSetup->( $client, $paramRef, Slim::Web::HTTP::filltemplatefile($class->page, $paramRef), $httpClient, $response );
 			};
@@ -229,6 +230,9 @@ sub handler {
 		}
 	}
 
+	Slim::Music::Import->doQueueScanTasks(0);
+	Slim::Music::Import->nextScanTask();
+
 	if ($client) {
 		$paramRef->{playericon} = Slim::Web::Settings::Player::Basic->getPlayerIcon($client,$paramRef);
 		$paramRef->{playertype} = $client->model();