From 53a1b8035054036cda32e157c6b9b3955a5dfb77 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Fri, 16 Dec 2022 14:37:39 -0800 Subject: [PATCH] FileDialog: fix case where no file extension filters are specified --- project/src/ui/FileDialog.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/project/src/ui/FileDialog.cpp b/project/src/ui/FileDialog.cpp index 3880524db..b4ce57fdd 100644 --- a/project/src/ui/FileDialog.cpp +++ b/project/src/ui/FileDialog.cpp @@ -84,12 +84,11 @@ namespace lime { const int numFilters = filter ? filters_vec.size() : 1; const wchar_t **filters = new const wchar_t*[numFilters]; - if (numFilters > 0) { + if (filter && numFilters > 0) { for (int index = 0; index < numFilters; index++) { filters[index] = const_cast(filters_vec[index].c_str()); } - } - else { + } else { filters[0] = NULL; } @@ -120,14 +119,13 @@ namespace lime { } } - const int numFilters = filter ? filters_vec.size() : 1; + const int numFilters = _filter ? filters_vec.size() : 1; const char **filters = new const char*[numFilters]; - if (numFilters > 0) { + if (_filter && numFilters > 0) { for (int index = 0; index < numFilters; index++) { filters[index] = const_cast(filters_vec[index].c_str()); } - } - else { + } else { filters[0] = NULL; } @@ -172,12 +170,11 @@ namespace lime { const int numFilters = filter ? filters_vec.size() : 1; const wchar_t **filters = new const wchar_t*[numFilters]; - if (numFilters > 0) { + if (filter && numFilters > 0) { for (int index = 0; index < numFilters; index++) { filters[index] = const_cast(filters_vec[index].c_str()); } - } - else { + } else { filters[0] = NULL; } @@ -207,14 +204,13 @@ namespace lime { } } - const int numFilters = filter ? filters_vec.size() : 1; + const int numFilters = _filter ? filters_vec.size() : 1; const char **filters = new const char*[numFilters]; - if (numFilters > 0) { + if (_filter && numFilters > 0) { for (int index = 0; index < numFilters; index++) { filters[index] = const_cast(filters_vec[index].c_str()); } - } - else { + } else { filters[0] = NULL; }