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

Merge branch 'dev' into newlocallab

Browse Source
This commit is contained in:
Ingo Weyrich
2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/filecatalog.cc
View File

@@ -25,6 +25,7 @@
#include <glib/gstdio.h>
#include "../rtengine/rt_math.h"
#include "../rtengine/procparams.h"
#include "guiutils.h"
#include "options.h"
@@ -36,6 +37,8 @@
#include "thumbimageupdater.h"
#include "batchqueue.h"
#include "placesbrowser.h"
#include "pathutils.h"
#include "thumbnail.h"
using namespace std;
@@ -602,7 +605,7 @@ std::vector<Glib::ustring> FileCatalog::getFileList()
names.push_back(Glib::build_filename(selectedDirectory, fname));
} catch (Glib::Exception& exception) {
if (options.rtSettings.verbose) {
if (rtengine::settings->verbose) {
std::cerr << exception.what() << std::endl;
}
}
@@ -610,7 +613,7 @@ std::vector<Glib::ustring> FileCatalog::getFileList()
} catch (Glib::Exception& exception) {
if (options.rtSettings.verbose) {
if (rtengine::settings->verbose) {
std::cerr << "Failed to list directory \"" << selectedDirectory << "\": " << exception.what() << std::endl;
}