fixed a bug that would incorrectly load an empty marker instead of th…

…e one selected in the menu
Stepland · Jan 18, 2019 · e267802 · e267802
1 parent 2fcd858
commit e267802
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Marker.cpp b/Marker.cpp
@@ -15,6 +15,13 @@ Marker::Marker() {
 }
 
 Marker::Marker(std::filesystem::path folder) {
+	if (validMarkerFolder(folder)) {
+		initFromFolder(folder);
+		return;
+	}
+	std::stringstream err;
+	err << "Invalid marker folder : " << folder.string();
+	throw std::runtime_error(err.str());
 }
 
 std::optional<std::reference_wrapper<sf::Texture>> Marker::getSprite(MarkerEndingState state, float seconds) {

diff --git a/main.cpp b/main.cpp
@@ -9,6 +9,7 @@
 
 int main(int argc, char** argv) {
 
+    // TODO : BPM & offset settings dans le menu Porperties
     // TODO : Highlight des notes qui s'entrechoquent
     // TODO : Undo / Redo
     // TODO : Debug Log
@@ -55,14 +56,14 @@ int main(int argc, char** argv) {
 
 
     // Loading markers preview
-    std::map<std::string,sf::Texture> markerPreviews;
+    std::map<std::filesystem::path,sf::Texture> markerPreviews;
     for (const auto& folder : std::filesystem::directory_iterator("assets/textures/markers")) {
         if (folder.is_directory()) {
             try {
                 sf::Texture markerPreview;
                 markerPreview.loadFromFile((folder/"ma15.png").string());
                 markerPreview.setSmooth(true);
-                markerPreviews.insert({folder.path().filename().string(),markerPreview});
+                markerPreviews.insert({folder,markerPreview});
             } catch (const std::exception& e) {
                 // ajouter e au log
             }