Merge pull request wavelog#1486 from int2001/chk_qra_loaded

Check if qra is already loaded
int2001 · Jan 9, 2025 · 782c87a · 782c87a
2 parents 6200b74 + f79bb43
commit 782c87a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
@@ -51,7 +51,9 @@ function getBearing($grid = '') {
 	if ($grid == '')  return '';
 	$ci =& get_instance();
 	if (($ci->session->userdata('user_locator') ?? '') != '') {
-		$ci->load->library('qra');
+		if(!$ci->load->is_loaded('qra')) {
+			$ci->load->library('qra');
+		}
 		$bearing=$ci->qra->get_bearing($ci->session->userdata('user_locator'),$grid);
 		return($bearing.'&deg;');
 	} else {

diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
@@ -54,7 +54,9 @@ function getBearing($grid = '') {
 	if ($grid == '')  return '';
 	$ci =& get_instance();
 	if (($ci->session->userdata('user_locator') ?? '') != '') {
-		$ci->load->library('qra');
+		if(!$ci->load->is_loaded('qra')) {
+			$ci->load->library('qra');
+		}
 		$bearing=$ci->qra->get_bearing($ci->session->userdata('user_locator'),$grid);
 		return($bearing.'&deg;');
 	} else {