Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:Beep6581/RawTherapee into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Beep6581 committed Dec 11, 2018
2 parents ef3abe7 + 0051e8f commit 6ab1579
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rtgui/filecatalog.cc
Expand Up @@ -1211,7 +1211,7 @@ void FileCatalog::developRequested(const std::vector<FileBrowserEntry*>& tbe, bo
params.resize.width = options.fastexport_resize_width;
params.resize.height = options.fastexport_resize_height;
}

params.resize.enabled = options.fastexport_resize_enabled;
params.resize.scale = options.fastexport_resize_scale;
params.resize.appliesTo = options.fastexport_resize_appliesTo;
Expand Down Expand Up @@ -2522,7 +2522,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event)

void FileCatalog::showToolBar()
{
if (!options.FileBrowserToolbarSingleRow) {
if (hbToolBar1STB) {
hbToolBar1STB->show();
}

Expand All @@ -2531,7 +2531,7 @@ void FileCatalog::showToolBar()

void FileCatalog::hideToolBar()
{
if (!options.FileBrowserToolbarSingleRow) {
if (hbToolBar1STB) {
hbToolBar1STB->hide();
}

Expand Down

0 comments on commit 6ab1579

Please sign in to comment.