liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't scan for darframes/flatfields/cluts if folder is not set, #2238

Browse Source
This commit is contained in:
heckflosse
2019-06-24 19:52:17 +02:00
parent d3fb58a19c
commit 66c9cd6177
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/dfmanager.cc
View File

@@ -270,8 +270,11 @@ void dfInfo::updateBadPixelList( RawImage *df )
// ************************* class DFManager ********************************* // ************************* class DFManager *********************************
void DFManager::init( Glib::ustring pathname ) void DFManager::init(const Glib::ustring& pathname)
{ {
if (pathname.empty()) {
return;
}
std::vector<Glib::ustring> names; std::vector<Glib::ustring> names;
auto dir = Gio::File::create_for_path (pathname); auto dir = Gio::File::create_for_path (pathname);

2
rtengine/dfmanager.h
View File

@@ -78,7 +78,7 @@ protected:
class DFManager class DFManager
{ {
public: public:
void init( Glib::ustring pathname ); void init(const Glib::ustring &pathname);
Glib::ustring getPathname() Glib::ustring getPathname()
{ {
return currentPath; return currentPath;

5
rtengine/ffmanager.cc
View File

@@ -231,8 +231,11 @@ void ffInfo::updateRawImage()
// ************************* class FFManager ********************************* // ************************* class FFManager *********************************
void FFManager::init( Glib::ustring pathname ) void FFManager::init(const Glib::ustring& pathname)
{ {
if (pathname.empty()) {
return;
}
std::vector<Glib::ustring> names; std::vector<Glib::ustring> names;
auto dir = Gio::File::create_for_path (pathname); auto dir = Gio::File::create_for_path (pathname);

2
rtengine/ffmanager.h
View File

@@ -75,7 +75,7 @@ protected:
class FFManager class FFManager
{ {
public: public:
void init( Glib::ustring pathname ); void init(const Glib::ustring &pathname);
Glib::ustring getPathname() Glib::ustring getPathname()
{ {
return currentPath; return currentPath;

2
rtgui/filmsimulation.cc
View File

@@ -300,7 +300,7 @@ ClutComboBox::ClutModel::ClutModel(const Glib::ustring &path)
{ {
m_model = Gtk::TreeStore::create (m_columns); m_model = Gtk::TreeStore::create (m_columns);
//set_model (m_model); //set_model (m_model);
count = parseDir(path); count = path.empty() ? 0 : parseDir(path);
} }
int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path) int ClutComboBox::ClutModel::parseDir(const Glib::ustring& path)