From 395f56964110bebbc8f36c726c5e5b442a758edc Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Sat, 13 Apr 2024 21:49:31 +0200
Subject: [PATCH] 4.2.6.0

---
 CHANGELOG.md                                            | 5 +++++
 addons/main/functions/fnc_PFHautomatic.sqf              | 1 -
 addons/main/functions/fnc_PFHmanual.sqf                 | 1 -
 addons/main/functions/fnc_findGPS.sqf                   | 3 +--
 addons/main/functions/fnc_fleximenu.sqf                 | 1 -
 addons/main/functions/fnc_onLoadDialog.sqf              | 1 -
 addons/main/functions/fnc_openFoldmap.sqf               | 1 -
 addons/main/functions/fnc_refreshAfterSettingChange.sqf | 1 -
 addons/main/functions/fnc_refreshMap.sqf                | 1 -
 addons/main/functions/fnc_toggleMap.sqf                 | 1 -
 addons/main/functions/fnc_toggleNvMode.sqf              | 1 -
 addons/main/functions/fnc_zoomIn.sqf                    | 1 -
 addons/main/functions/fnc_zoomOut.sqf                   | 1 -
 addons/main/script_version.hpp                          | 2 +-
 14 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07c73ef..a40f0f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog for Tao's Folding Map Rewrite 13.4.2023
 
+4.2.6.0
+- Fixed bug where GPS was not detected.
+
+# Changelog for Tao's Folding Map Rewrite 13.4.2023
+
 4.2.5.0
 - Added latest hemtt support.
 - Various fixes.
diff --git a/addons/main/functions/fnc_PFHautomatic.sqf b/addons/main/functions/fnc_PFHautomatic.sqf
index 473378c..9e0de8e 100644
--- a/addons/main/functions/fnc_PFHautomatic.sqf
+++ b/addons/main/functions/fnc_PFHautomatic.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Does automatic tracking.
diff --git a/addons/main/functions/fnc_PFHmanual.sqf b/addons/main/functions/fnc_PFHmanual.sqf
index 458dc83..a1358fe 100644
--- a/addons/main/functions/fnc_PFHmanual.sqf
+++ b/addons/main/functions/fnc_PFHmanual.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Does manual tracking.
diff --git a/addons/main/functions/fnc_findGPS.sqf b/addons/main/functions/fnc_findGPS.sqf
index 21476d0..e95fb9f 100644
--- a/addons/main/functions/fnc_findGPS.sqf
+++ b/addons/main/functions/fnc_findGPS.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Finds out if the unit has access to a GPS panel.
@@ -22,4 +21,4 @@ private _gpsAvailable = openGPS true;
 
 if (!_gpsOpened) then {openGPS false};
 
-_gpsAvailable && {(GVAR(itemsGPS) findAny (items _this)) != -1};
+GVAR(hasGPS) = _gpsAvailable || {(GVAR(itemsGPS) findAny (items _this)) != -1};
diff --git a/addons/main/functions/fnc_fleximenu.sqf b/addons/main/functions/fnc_fleximenu.sqf
index 9f11197..293509e 100644
--- a/addons/main/functions/fnc_fleximenu.sqf
+++ b/addons/main/functions/fnc_fleximenu.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Menu definition.
diff --git a/addons/main/functions/fnc_onLoadDialog.sqf b/addons/main/functions/fnc_onLoadDialog.sqf
index bc5e623..7bc3574 100644
--- a/addons/main/functions/fnc_onLoadDialog.sqf
+++ b/addons/main/functions/fnc_onLoadDialog.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * onLoad function for foldmap dialog.
diff --git a/addons/main/functions/fnc_openFoldmap.sqf b/addons/main/functions/fnc_openFoldmap.sqf
index 03e4a1b..607a108 100644
--- a/addons/main/functions/fnc_openFoldmap.sqf
+++ b/addons/main/functions/fnc_openFoldmap.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Opens map if possible.
diff --git a/addons/main/functions/fnc_refreshAfterSettingChange.sqf b/addons/main/functions/fnc_refreshAfterSettingChange.sqf
index cfde361..ba314b0 100644
--- a/addons/main/functions/fnc_refreshAfterSettingChange.sqf
+++ b/addons/main/functions/fnc_refreshAfterSettingChange.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Refreshes the map after a setting has been changed.
diff --git a/addons/main/functions/fnc_refreshMap.sqf b/addons/main/functions/fnc_refreshMap.sqf
index bfcda6f..8062f5d 100644
--- a/addons/main/functions/fnc_refreshMap.sqf
+++ b/addons/main/functions/fnc_refreshMap.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Open and closes the map to refresh the interface (for tablet and paper map).
diff --git a/addons/main/functions/fnc_toggleMap.sqf b/addons/main/functions/fnc_toggleMap.sqf
index 4ee5dcf..f90bb9d 100644
--- a/addons/main/functions/fnc_toggleMap.sqf
+++ b/addons/main/functions/fnc_toggleMap.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Toggle the folding map open and closed.
diff --git a/addons/main/functions/fnc_toggleNvMode.sqf b/addons/main/functions/fnc_toggleNvMode.sqf
index 5960c6e..205c7f6 100644
--- a/addons/main/functions/fnc_toggleNvMode.sqf
+++ b/addons/main/functions/fnc_toggleNvMode.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Toggle the map's nightvision view (if using tablet map).
diff --git a/addons/main/functions/fnc_zoomIn.sqf b/addons/main/functions/fnc_zoomIn.sqf
index 535bd8b..0936bd1 100644
--- a/addons/main/functions/fnc_zoomIn.sqf
+++ b/addons/main/functions/fnc_zoomIn.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Zoom in.
diff --git a/addons/main/functions/fnc_zoomOut.sqf b/addons/main/functions/fnc_zoomOut.sqf
index c3ef98f..4aaf456 100644
--- a/addons/main/functions/fnc_zoomOut.sqf
+++ b/addons/main/functions/fnc_zoomOut.sqf
@@ -1,5 +1,4 @@
 #include "..\script_component.hpp"
-
 /*
  * Author: johnb43
  * Zoom out.
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
index 0c8e1cc..74c2859 100644
--- a/addons/main/script_version.hpp
+++ b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 4
 #define MINOR 2
-#define PATCHLVL 5
+#define PATCHLVL 6
 #define BUILD 0