Fix Windows build

Ravbug · Sep 27, 2024 · ce5b752 · ce5b752
1 parent 530e566
commit ce5b752
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/source/create_dialog_derived.cpp b/source/create_dialog_derived.cpp
@@ -168,12 +168,7 @@ void CreateProjectDialogD::loadTemplates(const editor& e){
 	templateCtrl->ClearAll();
 
 	//open the folder
-#if __APPLE__
-    auto templatesFolder = e.path / templatesDir;
-
-#else
-	auto templatesFolder = e.path /e.name / templatesDir;
-#endif
+	auto templatesFolder = e.templatePath();
 
     for(const auto& entry : std::filesystem::directory_iterator{templatesFolder}){
         //does the file start with the correct prefix?
@@ -182,7 +177,7 @@ void CreateProjectDialogD::loadTemplates(const editor& e){
             //add it to the UI
             wxListItem i;
             i.SetId(0);
-            string label = path.filename();
+            string label = path.filename().string();
             i.SetText(label.substr(templatePrefix.length()+1));
 
             templateCtrl->InsertItem(i);

diff --git a/source/globals.h b/source/globals.h
@@ -117,11 +117,7 @@ struct editor {
 	std::string name;
 	std::filesystem::path path;
 	decltype(path) executablePath() const {
-#if __APPLE__
-        return path / executable;
-#else
-		return path / name / executable;
-#endif
+		return path / executable;
 	}
 
     auto templatePath() const{

diff --git a/source/interface_derived.cpp b/source/interface_derived.cpp
@@ -637,7 +637,7 @@ void MainFrameDerived::LoadEditorVersions(){
                 auto p = entry / executable;
                 if (filesystem::exists(p)){
                     //add it to the backing datastructure
-                    editor e = {entry.filename(), p};
+                    editor e = {entry.filename().string(), entry};
                     addInstall(e);
                 }
 #endif