From 31aee866f428c82878b66fe1fc69dc23b690e354 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Fri, 20 Mar 2020 15:09:46 +0100
Subject: [PATCH] Check if options are available before matching on them

This prevents a QML warning when the ListModel is created before the property provider is. This QML warning looked like this:
2020-03-20 15:04:30,012 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [406]: file:///home/trin/Gedeeld/Projects/Cura/cura/../resources/qml/MachineSettings/ComboBoxWithOptions.qml:74: TypeError: Cannot call method 'match' of undefined

Done during Turbo Testing and Tooling.
---
 .../qml/MachineSettings/ComboBoxWithOptions.qml | 17 ++++++++++-------
 .../Custom/QualitiesWithIntentMenu.qml          |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/resources/qml/MachineSettings/ComboBoxWithOptions.qml b/resources/qml/MachineSettings/ComboBoxWithOptions.qml
index 715a6e9224..0faf17ab71 100644
--- a/resources/qml/MachineSettings/ComboBoxWithOptions.qml
+++ b/resources/qml/MachineSettings/ComboBoxWithOptions.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2020 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10
@@ -71,14 +71,17 @@ UM.TooltipArea
         {
             clear()
             // Options come in as a string-representation of an OrderedDict
-            var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/)
-            if (options)
+            if(propertyProvider.properties.options)
             {
-                options = options[1].split("), (")
-                for (var i = 0; i < options.length; i++)
+                var options = propertyProvider.properties.options.match(/^OrderedDict\(\[\((.*)\)\]\)$/);
+                if(options)
                 {
-                    var option = options[i].substring(1, options[i].length - 1).split("', '")
-                    append({ text: option[1], value: option[0] })
+                    options = options[1].split("), (");
+                    for(var i = 0; i < options.length; i++)
+                    {
+                        var option = options[i].substring(1, options[i].length - 1).split("', '");
+                        append({ text: option[1], value: option[0] });
+                    }
                 }
             }
         }
diff --git a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
index ff235a8a67..3ae180f133 100644
--- a/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
+++ b/resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
@@ -1,4 +1,4 @@
-// Copyright (c) 2019 Ultimaker B.V.
+// Copyright (c) 2020 Ultimaker B.V.
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.10