Merge branch 'dev' of github.com:Beep6581/RawTherapee into dev

This commit is contained in:
Morgan Hardwood
2018-12-11 22:04:40 +01:00

View File

@@ -1211,7 +1211,7 @@ void FileCatalog::developRequested(const std::vector<FileBrowserEntry*>& tbe, bo
params.resize.width = options.fastexport_resize_width; params.resize.width = options.fastexport_resize_width;
params.resize.height = options.fastexport_resize_height; params.resize.height = options.fastexport_resize_height;
} }
params.resize.enabled = options.fastexport_resize_enabled; params.resize.enabled = options.fastexport_resize_enabled;
params.resize.scale = options.fastexport_resize_scale; params.resize.scale = options.fastexport_resize_scale;
params.resize.appliesTo = options.fastexport_resize_appliesTo; params.resize.appliesTo = options.fastexport_resize_appliesTo;
@@ -2522,7 +2522,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event)
void FileCatalog::showToolBar() void FileCatalog::showToolBar()
{ {
if (!options.FileBrowserToolbarSingleRow) { if (hbToolBar1STB) {
hbToolBar1STB->show(); hbToolBar1STB->show();
} }
@@ -2531,7 +2531,7 @@ void FileCatalog::showToolBar()
void FileCatalog::hideToolBar() void FileCatalog::hideToolBar()
{ {
if (!options.FileBrowserToolbarSingleRow) { if (hbToolBar1STB) {
hbToolBar1STB->hide(); hbToolBar1STB->hide();
} }