Merge branch 'fix' into 'pregmod-master'

fixes

Closes #2654 and #2659

See merge request !8584

compile.sh

@@ -75,7 +75,7 @@ function compile() {
 	fi
 
 	devTools/concatFiles.sh js/ '*.js' bin/fc.js
-	devTools/concatFiles.sh css/ '*.css' bin/css.js
+	devTools/concatFiles.sh css/ '*.css' bin/fc.css
 	$TWEEGO_EXE -o $file --module=bin/fc.js --module=bin/fc.css --head resources/raster/favicon/arcologyVector.html src/ || build_failed="true"
 	rm -f bin/fc.js
 	rm -f bin/fc.css

src/005-passages/endWeekPassages.js

 new App.DomPassage("Slave Assignments Report",
 	() => {
-		V.nextLink = "Economics"; V.nextButton = "Continue";
+		V.nextLink = "Economics";
+		V.nextButton = "Continue";
 
 		const f = document.createDocumentFragment();
-		App.UI.DOM.appendNewElement("h1", f, `${V.arcologies[0].name} Weekly Slave Report - Week ${V.week}`);
-		f.append(App.EndWeek.slaveAssignmentReport());
 
-		App.UI.EndWeekAnim.end();
+		try {
+			App.UI.DOM.appendNewElement("h1", f, `${V.arcologies[0].name} Weekly Slave Report - Week ${V.week}`);
+			f.append(App.EndWeek.slaveAssignmentReport());
+		} finally {
+			// whatever happens, stop the end week animation so we at least know there is an error.
+			App.UI.EndWeekAnim.end();
+		}
 
 		return f;
 	}