From 919d0dc8700f3700f73471ff59c42e3ada74d4d2 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 12 Feb 2019 11:11:32 -0500
Subject: [PATCH] Revert "Sim: Attempt to fix error on first FG loadup"

This reverts commit 2d3159e3dc9aae8f4732ae657623642fd1fdd48f.
---
 A320-main.xml                                |  7 ++----
 Models/Instruments/IESI/IESI.nas             |  2 +-
 Models/Instruments/Lower-ECAM/Lower-ECAM.nas |  2 +-
 Models/Instruments/MCDU/MCDU.nas             |  2 +-
 Models/Instruments/ND/canvas/ND.nas          |  2 +-
 Models/Instruments/PFD/PFD.nas               |  2 +-
 Models/Instruments/Upper-ECAM/Upper-ECAM.nas |  2 +-
 Nasal/libraries.nas                          | 25 --------------------
 revision.txt                                 |  2 +-
 9 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index daff6607..e0a5dceb 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -5,6 +5,7 @@
 <PropertyList>
 
 	<sim>
+
 		<author>it0uchpods Design Group: Joshua Davidson (it0uchpods), Jonathan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555)</author>
 		
 		<status>Pre V1.0</status>
@@ -402,11 +403,7 @@
 			<z-offset-max-m type="float">300.0</z-offset-max-m>
 		</current-view>
 		
-		<minimum-fg-version>2018.1.0</minimum-fg-version>
-		
-		<signals n="0">
-			<hack-canvas type="bool">0</hack-canvas>
-		</signals>
+		 <minimum-fg-version>2018.1.0</minimum-fg-version>
 	</sim>
 	
 	<consumables>
diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas
index 95ed6fa8..182fe5e0 100644
--- a/Models/Instruments/IESI/IESI.nas
+++ b/Models/Instruments/IESI/IESI.nas
@@ -192,7 +192,7 @@ var canvas_IESI = {
 	},
 };
 
-setlistener("/sim/signals/hack-canvas", func {
+setlistener("sim/signals/fdm-initialized", func {
 	IESI_display = canvas.new({
 		"name": "IESI",
 		"size": [1024, 1024],
diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
index 6e1926b6..c3ee50e1 100644
--- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
+++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas
@@ -3072,7 +3072,7 @@ var canvas_lowerECAM_test = {
 	},
 };
 
-setlistener("/sim/signals/hack-canvas", func {
+setlistener("sim/signals/fdm-initialized", func {
 	lowerECAM_display = canvas.new({
 		"name": "lowerECAM",
 		"size": [1024, 1024],
diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas
index 9abb0e8f..e62c69f7 100644
--- a/Models/Instruments/MCDU/MCDU.nas
+++ b/Models/Instruments/MCDU/MCDU.nas
@@ -1742,7 +1742,7 @@ var canvas_MCDU_2 = {
 	},
 };
 
-setlistener("/sim/signals/hack-canvas", func {
+setlistener("sim/signals/fdm-initialized", func {
 	MCDU1_display = canvas.new({
 		"name": "MCDU1",
 		"size": [1024, 864],
diff --git a/Models/Instruments/ND/canvas/ND.nas b/Models/Instruments/ND/canvas/ND.nas
index 2a2a8906..cfaca568 100644
--- a/Models/Instruments/ND/canvas/ND.nas
+++ b/Models/Instruments/ND/canvas/ND.nas
@@ -287,7 +287,7 @@ var canvas_ND_2_test = {
 	},
 };
 
-setlistener("/sim/signals/hack-canvas", func {
+setlistener("sim/signals/fdm-initialized", func {
 	setprop("instrumentation/efis[0]/inputs/plan-wpt-index", -1);
 	setprop("instrumentation/efis[1]/inputs/plan-wpt-index", -1);
 
diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas
index 85318ab2..f9c39a96 100644
--- a/Models/Instruments/PFD/PFD.nas
+++ b/Models/Instruments/PFD/PFD.nas
@@ -1283,7 +1283,7 @@ var canvas_PFD_2_mismatch = {
 	},
 };
 
-setlistener("/sim/signals/hack-canvas", func {
+setlistener("sim/signals/fdm-initialized", func {
 	PFD1_display = canvas.new({
 		"name": "PFD1",
 		"size": [1024, 1024],
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index af39a89b..30590b6b 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -1159,7 +1159,7 @@ var canvas_upperECAM_test = {
 	},
 };
 
-setlistener("/sim/signals/hack-canvas", func {
+setlistener("sim/signals/fdm-initialized", func {
 	upperECAM_display = canvas.new({
 		"name": "upperECAM",
 		"size": [1024, 1024],
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 52c7ebcb..f4de37fc 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -206,31 +206,6 @@ var systemsInit = func {
 
 setlistener("/sim/signals/fdm-initialized", func {
 	systemsInit();
-	
-	canvas.Text._lastText = canvas.Text["_lastText"];
-	canvas.Text.setText = func(text) {
-		if (text == me._lastText and text != nil and size(text) == size(me._lastText)) {return me;}
-		me._lastText = text;
-		me.set("text", typeof(text) == 'scalar' ? text : "");
-	};
-	canvas.Element._lastVisible = nil;
-	canvas.Element.show = func {
-		if (1 == me._lastVisible) {return me;}
-		me._lastVisible = 1;
-		me.setBool("visible", 1);
-	};
-	canvas.Element.hide = func {
-		if (0 == me._lastVisible) {return me;}
-		me._lastVisible = 0;
-		me.setBool("visible", 0);
-	};
-	canvas.Element.setVisible = func(vis) {
-		if (vis == me._lastVisible) {return me;}
-		me._lastVisible = vis;
-		me.setBool("visible", vis);
-	};
-	
-	setprop("/sim/signals/hack-canvas", 1);
 });
 
 var systemsLoop = maketimer(0.1, func {
diff --git a/revision.txt b/revision.txt
index fad0b619..9a9b8aca 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4761
\ No newline at end of file
+4760
\ No newline at end of file