From e98ee6899e8f98b9146095ffd93ea169c4f1fd71 Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Wed, 26 Jul 2023 10:08:11 +0000
Subject: [PATCH] Avoid merge-conflicts

---
 application/models/Dxcluster_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Dxcluster_model.php b/application/models/Dxcluster_model.php
index f9a9e00c..4fd7e1e8 100644
--- a/application/models/Dxcluster_model.php
+++ b/application/models/Dxcluster_model.php
@@ -61,7 +61,7 @@ class Dxcluster_model extends CI_Model {
 							$singlespot->dxcc_spotter=$dxcc;
 						}
 						if ( ($de != '') && ($de != 'Any') && (property_exists($singlespot->dxcc_spotter,'cont')) ){	// If we have a "de continent" and a filter-wish filter on that
-							if (strtolower($de) == strtolower($singlespot->dxcc_spotter->cont)) {
+							if (strtolower($de) == strtolower($singlespot->dxcc_spotter->cont ?? '')) {
 								$singlespot->worked_call = ($this->logbook_model->check_if_callsign_worked_in_logbook($singlespot->spotted, $logbooks_locations_array, $singlespot->band) == 1);
 								array_push($spotsout,$singlespot);
 							}