1 files changed, 9 insertions, 7 deletions

diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/xs/src/slic3r/GUI/ConfigWizard.cpp
index 9f736ded8..e5fe7c0a2 100644
--- a/xs/src/slic3r/GUI/ConfigWizard.cpp
+++ b/xs/src/slic3r/GUI/ConfigWizard.cpp
@@ -23,6 +23,7 @@
 namespace Slic3r {
 namespace GUI {
 
+#define MAIN_VENDOR "None"
 
 // Printer model picker GUI control
 
@@ -96,7 +97,7 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, cons
 			auto *cbox = new Checkbox(variants_panel, label, model_id, variant.name);
 			const size_t idx = cboxes.size();
 			cboxes.push_back(cbox);
-			bool enabled = appconfig_vendors.get_variant("PrusaResearch", model_id, variant.name);
+			bool enabled = appconfig_vendors.get_variant(MAIN_VENDOR, model_id, variant.name);
 			variants_checked += enabled;
 			cbox->SetValue(enabled);
 			variants_sizer->Add(cbox, 0, wxBOTTOM, 3);
@@ -232,7 +233,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent, bool check_first_variant) :
 	if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
 		wxString::Format(_(L("Run %s")), ConfigWizard::name());
 		append_text(wxString::Format(
-			_(L("Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
+			_(L("Hello, welcome to Slic3r++ (fork of Slic3r Prusa Edition)! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")),
 			ConfigWizard::name())
 		);
 	} else {
@@ -241,7 +242,8 @@ PageWelcome::PageWelcome(ConfigWizard *parent, bool check_first_variant) :
 	}
 
 	const auto &vendors = wizard_p()->vendors;
-	const auto vendor_prusa = vendors.find("PrusaResearch");
+	printf("vendors count : %d", vendors.size());
+	const auto vendor_prusa = vendors.find(MAIN_VENDOR);
 
 	if (vendor_prusa != vendors.cend()) {
 		AppConfig &appconfig_vendors = this->wizard_p()->appconfig_vendors;
@@ -330,7 +332,7 @@ PageVendors::PageVendors(ConfigWizard *parent) :
 
 	for (const auto vendor_pair : wizard_p()->vendors) {
 		const auto &vendor = vendor_pair.second;
-		if (vendor.id == "PrusaResearch") { continue; }
+		if (vendor.id == MAIN_VENDOR) { continue; }
 
 		auto *picker = new PrinterPicker(this, vendor, appconfig_vendors);
 		picker->Hide();
@@ -633,8 +635,8 @@ static const std::unordered_map<std::string, std::pair<std::string, std::string>
 
 void ConfigWizard::priv::load_vendors()
 {
-	const auto vendor_dir = fs::path(Slic3r::data_dir()) / "vendor";
-	const auto rsrc_vendor_dir = fs::path(resources_dir()) / "profiles";
+	const fs::path vendor_dir = fs::path(Slic3r::data_dir()) / "vendor";
+	const fs::path rsrc_vendor_dir = fs::path(resources_dir()) / "profiles";
 
 	// Load vendors from the "vendors" directory in datadir
 	for (fs::directory_iterator it(vendor_dir); it != fs::directory_iterator(); ++it) {
@@ -680,7 +682,7 @@ void ConfigWizard::priv::load_vendors()
 
 			const auto &model = needle->second.first;
 			const auto &variant = needle->second.second;
-			appconfig_vendors.set_variant("PrusaResearch", model, variant, true);
+			appconfig_vendors.set_variant(MAIN_VENDOR, model, variant, true);
 		}
 	}
 }