From 4c1039131b96f0e2cac8724e54a2e90d7afdad32 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Mar 2016 09:07:02 +0000 Subject: Ignore .DS_Store files in potential image directories. --- src/lib/content_factory.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index e1535c510..c3278e30e 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -101,9 +101,9 @@ content_factory (shared_ptr film, boost::filesystem::path path) LOG_GENERAL ("Checking file %1", i->path()); - if (boost::starts_with (i->path().leaf().string(), "._")) { + if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") { /* We ignore these files */ - LOG_GENERAL ("Ignored %1 (starts with {._})", i->path()); + LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path()); continue; } -- cgit v1.2.3 From a5bb775f62a7d0925c830b1e0404d49f998109ca Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Mar 2016 16:49:24 +0000 Subject: Supporter. --- src/wx/about_dialog.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index b61333ec9..1de043f5e 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -201,6 +201,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Jerome Cohen Olivar")); supported_by.Add (wxT ("Kevin Orman")); supported_by.Add (wxT ("Rui Pereira")); + supported_by.Add (wxT ("Denis Postle")); supported_by.Add (wxT ("Aditya Pratama")); supported_by.Add (wxT ("Ceridwen Productions")); supported_by.Add (wxT ("Ivan Pullman")); -- cgit v1.2.3