From 244d0342ecac9ce978c6c934ea6fb16091fd68a0 Mon Sep 17 00:00:00 2001
From: Aktanusa <chanam.geo@yahoo.com>
Date: Thu, 10 Oct 2019 20:23:23 -0400
Subject: [PATCH] Minor code cleanup from merge

---
 CookieMonster.js | 13 ++++++++-----
 src/Disp.js      | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CookieMonster.js b/CookieMonster.js
index 0f915a8..856cef2 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1511,10 +1511,11 @@ CM.Disp.UpdateTitle = function() {
 		document.title = CM.Cache.Title;
 	}
 	else if (CM.Config.Title == 1) {
+		var addFC = false;
 		var addSP = false;
 
 		var titleGC;
-		var titleFC = '';
+		var titleFC;
 		var titleSP;
 		if (CM.Disp.lastGoldenCookieState) {
 			if (CM.Disp.goldenShimmer.wrath) {
@@ -1531,6 +1532,7 @@ CM.Disp.UpdateTitle = function() {
 			titleGC = '[GS]'
 		}
 		if (CM.Disp.lastTickerFortuneState) {
+			addFC = true;
 			titleFC = '[F]';
 		}
 		if (Game.season == 'christmas') {
@@ -1548,14 +1550,11 @@ CM.Disp.UpdateTitle = function() {
 			str = str.substring(str.lastIndexOf(']') + 1);
 		}
 
-		document.title = titleFC + titleGC + (addSP ? titleSP : '') + ' ' + str;
+		document.title = titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '') + ' ' + str;
 	}
 	else if (CM.Config.Title == 2) {
 		var str = '';
 		var spawn = false;
-		if (CM.Disp.lastTickerFortuneState) {
-			str += '[F]';
-		}
 		if (CM.Disp.lastGoldenCookieState) {
 			spawn = true;
 			if (CM.Disp.goldenShimmer.wrath) {
@@ -1565,6 +1564,10 @@ CM.Disp.UpdateTitle = function() {
 				str += '[G ' +  Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
 			}
 		}
+		if (CM.Disp.lastTickerFortuneState) {
+			spawn = true;
+			str += '[F]';
+		}
 		if (Game.season == 'christmas' && CM.Disp.lastSeasonPopupState) {
 			str += '[R ' +  Math.ceil(CM.Disp.seasonPopShimmer.life / Game.fps) + ']';
 			spawn = true;
diff --git a/src/Disp.js b/src/Disp.js
index 3996bb0..53fbcb0 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -912,10 +912,11 @@ CM.Disp.UpdateTitle = function() {
 		document.title = CM.Cache.Title;
 	}
 	else if (CM.Config.Title == 1) {
+		var addFC = false;
 		var addSP = false;
 
 		var titleGC;
-		var titleFC = '';
+		var titleFC;
 		var titleSP;
 		if (CM.Disp.lastGoldenCookieState) {
 			if (CM.Disp.goldenShimmer.wrath) {
@@ -932,6 +933,7 @@ CM.Disp.UpdateTitle = function() {
 			titleGC = '[GS]'
 		}
 		if (CM.Disp.lastTickerFortuneState) {
+			addFC = true;
 			titleFC = '[F]';
 		}
 		if (Game.season == 'christmas') {
@@ -949,14 +951,11 @@ CM.Disp.UpdateTitle = function() {
 			str = str.substring(str.lastIndexOf(']') + 1);
 		}
 
-		document.title = titleFC + titleGC + (addSP ? titleSP : '') + ' ' + str;
+		document.title = titleGC + (addFC ? titleFC : '') + (addSP ? titleSP : '') + ' ' + str;
 	}
 	else if (CM.Config.Title == 2) {
 		var str = '';
 		var spawn = false;
-		if (CM.Disp.lastTickerFortuneState) {
-			str += '[F]';
-		}
 		if (CM.Disp.lastGoldenCookieState) {
 			spawn = true;
 			if (CM.Disp.goldenShimmer.wrath) {
@@ -966,6 +965,10 @@ CM.Disp.UpdateTitle = function() {
 				str += '[G ' +  Math.ceil(CM.Disp.goldenShimmer.life / Game.fps) + ']';
 			}
 		}
+		if (CM.Disp.lastTickerFortuneState) {
+			spawn = true;
+			str += '[F]';
+		}
 		if (Game.season == 'christmas' && CM.Disp.lastSeasonPopupState) {
 			str += '[R ' +  Math.ceil(CM.Disp.seasonPopShimmer.life / Game.fps) + ']';
 			spawn = true;