diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py
index b84dc26f0a..74ef7ae7b4 100644
--- a/cura/Machines/Models/MachineListModel.py
+++ b/cura/Machines/Models/MachineListModel.py
@@ -115,7 +115,9 @@ class MachineListModel(ListModel):
online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks))
online_machine_stacks.sort(key=lambda machine: machine.getName().upper())
- other_machine_stacks.remove(abstract_machine)
+ if abstract_machine in other_machine_stacks:
+ other_machine_stacks.remove(abstract_machine)
+
if abstract_machine in online_machine_stacks:
online_machine_stacks.remove(abstract_machine)
diff --git a/packaging/msi/CustomizeCuraDlg.wxs b/packaging/msi/CustomizeCuraDlg.wxs
deleted file mode 100644
index 9214ae7693..0000000000
--- a/packaging/msi/CustomizeCuraDlg.wxs
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/packaging/msi/UltiMaker-Cura.wxs.jinja b/packaging/msi/UltiMaker-Cura.wxs.jinja
index 8cde050497..a183a97d5f 100644
--- a/packaging/msi/UltiMaker-Cura.wxs.jinja
+++ b/packaging/msi/UltiMaker-Cura.wxs.jinja
@@ -19,15 +19,17 @@
Comments="Copyright (c) {{ year }} {{ company }}" />
-
+
+
+
-
+
@@ -36,7 +38,7 @@
@@ -48,23 +50,7 @@
-
-
-
-
-
- 1
-
- WixUI_InstallMode = "Change"
- WixUI_InstallMode = "InstallCustom"
- 1
-
- WixUI_InstallMode = "InstallCustom"
- WixUI_InstallMode = "Change"
- 1
-
-
-
+
@@ -136,7 +122,7 @@
-
+
+
\ No newline at end of file
diff --git a/packaging/msi/create_windows_msi.py b/packaging/msi/create_windows_msi.py
index 6f1f52c3d1..268fc670a2 100644
--- a/packaging/msi/create_windows_msi.py
+++ b/packaging/msi/create_windows_msi.py
@@ -41,7 +41,6 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
web_site="https://ultimaker.com",
year=datetime.now().year,
upgrade_code=str(uuid.uuid5(uuid.NAMESPACE_DNS, app_name)),
- shortcut_uuid=str(uuid.uuid5(uuid.NAMESPACE_DNS, f"Shortcut {app_name}")),
cura_license_file=str(source_loc.joinpath("packaging", "msi", "cura_license.rtf")),
cura_banner_top=str(source_loc.joinpath("packaging", "msi", "banner_top.bmp")),
cura_banner_side=str(source_loc.joinpath("packaging", "msi", "banner_side.bmp")),
@@ -51,12 +50,6 @@ def generate_wxs(source_path: Path, dist_path: Path, filename: Path, app_name: s
with open(work_loc.joinpath("UltiMaker-Cura.wxs"), "w") as f:
f.write(wxs_content)
- try:
- shutil.copy(source_loc.joinpath("packaging", "msi", "CustomizeCuraDlg.wxs"),
- work_loc.joinpath("CustomizeCuraDlg.wxs"))
- except shutil.SameFileError:
- pass
-
try:
shutil.copy(source_loc.joinpath("packaging", "msi", "ExcludeComponents.xslt"),
work_loc.joinpath("ExcludeComponents.xslt"))
@@ -79,7 +72,6 @@ def build(dist_path: Path, filename: Path):
wxs_loc = work_loc.joinpath("UltiMaker-Cura.wxs")
heat_loc = work_loc.joinpath("HeatFile.wxs")
exclude_components_loc = work_loc.joinpath("ExcludeComponents.xslt")
- manageoldcuradlg_loc = work_loc.joinpath("CustomizeCuraDlg.wxs")
build_loc = work_loc.joinpath("build_msi")
heat_command = ["heat",
@@ -102,14 +94,12 @@ def build(dist_path: Path, filename: Path):
"-ext", "WixFirewallExtension",
"-out", f"{build_loc.as_posix()}\\",
f"{wxs_loc.as_posix()}",
- f"{heat_loc.as_posix()}",
- f"{manageoldcuradlg_loc.as_posix()}"]
+ f"{heat_loc.as_posix()}"]
subprocess.call(build_command)
link_command = ["light",
f"{build_loc.joinpath(wxs_loc.name).with_suffix('.wixobj')}",
f"{build_loc.joinpath(heat_loc.name).with_suffix('.wixobj')}",
- f"{build_loc.joinpath(manageoldcuradlg_loc.name).with_suffix('.wixobj')}",
"-sw1076", # Don't pollute logs with warnings from auto generated content
"-dcl:high", # Use high compression ratio
"-sval", # Disable ICE validation otherwise the CI complains