Skip to content

Commit bc56a86

Browse files
committed
qtplasmac: check for valid default material
1 parent a83d4e0 commit bc56a86

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '238.310'
1+
VERSION = '238.311'
22
LCNCVER = '2.9'
33
DOCSVER = LCNCVER
44

@@ -5015,6 +5015,9 @@ def load_material_file(self, keepTemp=False):
50155015
self.write_materials_to_dict(mat)
50165016
self.display_materials()
50175017
self.defaultMaterial = self.PREFS.getpref('Default material', self.materialNumList[0], int, 'GUI_OPTIONS')
5018+
if not self.material_exists(self.defaultMaterial):
5019+
self.defaultMaterial = self.materialList[0]
5020+
self.PREFS.putpref('Default material', self.defaultMaterial, int, 'GUI_OPTIONS')
50185021
self.change_material(self.defaultMaterial)
50195022
self.w.materials_box.setCurrentIndex(self.materialList.index(self.defaultMaterial))
50205023
self.w.material_selector.setCurrentIndex(self.w.materials_box.currentIndex())

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.9</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>238.311 2024 Mar 30</u></b>
30+
<ul style="margin:0;">
31+
<li>check for valid default material</li>
32+
</ul>
33+
2934
<br><b><u>238.310 2024 Mar 21</u></b>
3035
<ul style="margin:0;">
3136
<li>fix missing error message for invalid parameter in temporary material</li>

0 commit comments

Comments
 (0)