merge fix

0xfedcafe · 0xfedcafe · commit 8b9cde1ae47f · 2025-05-26T19:22:00.000+02:00
diff --git a/application/F3DStarter.cxx b/application/F3DStarter.cxx
@@ -1440,9 +1440,9 @@ void F3DStarter::LoadFileGroup(
           else
           {
             auto forceReader = this->Internals->LibOptions.scene.force_reader;
-            if (force_reader.has_value())
+            if (forceReader.has_value())
             {
-              f3d::log::warn("Forced reader ", *force_reader, " doesn't exist");
+              f3d::log::warn("Forced reader ", *forceReader, " doesn't exist");
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -1440,9 +1440,9 @@ void F3DStarter::LoadFileGroup(`
`1440`	`1440`	`else`
`1441`	`1441`	`{`
`1442`	`1442`	`auto forceReader = this->Internals->LibOptions.scene.force_reader;`
`1443`		`- if (force_reader.has_value())`
	`1443`	`+ if (forceReader.has_value())`
`1444`	`1444`	`{`
`1445`		`- f3d::log::warn("Forced reader ", *force_reader, " doesn't exist");`
	`1445`	`+ f3d::log::warn("Forced reader ", *forceReader, " doesn't exist");`
`1446`	`1446`	`}`
`1447`	`1447`	`else`
`1448`	`1448`	`{`