From b72c6b7afc408f5c7360d1ba9b90cd81d5699310 Mon Sep 17 00:00:00 2001
From: cram42 <git+grant.leroux@gmail.com>
Date: Wed, 1 Feb 2023 17:48:39 +1100
Subject: [PATCH] Fix 2D barcode defaults

---
 app/View/Label.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/View/Label.php b/app/View/Label.php
index 67742d88e6..de955afffa 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -124,9 +124,9 @@ class Label implements View
                 if ($template->getSupport2DBarcode()) {
                     $barcode2DType = $settings->label2_2d_type;
                     $barcode2DType = ($barcode2DType == 'default') ? 
-                        (($settings->qr_code) ? $settings->barcode_type : null) :
+                        $settings->barcode_type :
                         $barcode2DType;
-                    if ($barcode2DType != 'none') {
+                    if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
                             case 'hardware_id':