Qt: use complete.zip found in ldraw dir only if LDrawZip was not set

pbartfai · pbartfai · commit 3ce07d21de8f · 2025-06-09T11:21:27.000+02:00
diff --git a/QT/ModelViewerWidget.cpp b/QT/ModelViewerWidget.cpp
@@ -1909,7 +1909,7 @@ bool ModelViewerWidget::verifyLDrawDir(char *value)
 				LDLModel::setLDrawDir(value);
 				found = true;
 				QDir::setCurrent(value);
-				if (QDir::current().exists("complete.zip"))
+				if (QDir::current().exists("complete.zip") && !Preferences::getLDrawZipPath())
 				{
 					char *ldrawZip = copyString(value, 255);
 					strcat(ldrawZip, "/complete.zip");

Original file line number	Diff line number	Diff line change
`@@ -1909,7 +1909,7 @@ bool ModelViewerWidget::verifyLDrawDir(char *value)`
`1909`	`1909`	`LDLModel::setLDrawDir(value);`
`1910`	`1910`	`found = true;`
`1911`	`1911`	`QDir::setCurrent(value);`
`1912`		`- if (QDir::current().exists("complete.zip"))`
	`1912`	`+ if (QDir::current().exists("complete.zip") && !Preferences::getLDrawZipPath())`
`1913`	`1913`	`{`
`1914`	`1914`	`char *ldrawZip = copyString(value, 255);`
`1915`	`1915`	`strcat(ldrawZip, "/complete.zip");`