Merge pull request #9 from bwrsandman/no_ext

gallickgunner · web-flow · commit b48086f9b74a · 2020-02-12T15:19:11.000+05:00
Fix crash when selected file has not ext
diff --git a/FileBrowser/ImGuiFileBrowser.cpp b/FileBrowser/ImGuiFileBrowser.cpp
@@ -720,9 +720,9 @@ namespace imgui_addons
 
     bool ImGuiFileBrowser::validateFile()
     {
-        int idx = selected_fn.find_last_of(".");
-        std::string ext = selected_fn.substr(idx, selected_fn.length() - idx);
-        return (std::find(valid_exts.begin(), valid_exts.end(), ext) != valid_exts.end());
+        int idx = selected_fn.find_last_of('.');
+        std::string file_ext = idx == std::string::npos ? "" : selected_fn.substr(idx, selected_fn.length() - idx);
+        return (std::find(valid_exts.begin(), valid_exts.end(), file_ext) != valid_exts.end());
     }
 
     void ImGuiFileBrowser::parsePathTabs(std::string path)

Original file line number	Diff line number	Diff line change
`@@ -720,9 +720,9 @@ namespace imgui_addons`
`720`	`720`
`721`	`721`	`bool ImGuiFileBrowser::validateFile()`
`722`	`722`	`{`
`723`		`- int idx = selected_fn.find_last_of(".");`
`724`		`- std::string ext = selected_fn.substr(idx, selected_fn.length() - idx);`
`725`		`- return (std::find(valid_exts.begin(), valid_exts.end(), ext) != valid_exts.end());`
	`723`	`+ int idx = selected_fn.find_last_of('.');`
	`724`	`+ std::string file_ext = idx == std::string::npos ? "" : selected_fn.substr(idx, selected_fn.length() - idx);`
	`725`	`+ return (std::find(valid_exts.begin(), valid_exts.end(), file_ext) != valid_exts.end());`
`726`	`726`	`}`
`727`	`727`
`728`	`728`	`void ImGuiFileBrowser::parsePathTabs(std::string path)`