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

solved merge conflicts for merge from dev into newlocallab

Browse Source
This commit is contained in:
heckflosse
2017-11-15 16:49:53 +01:00
parent 0ac7744347 3f1e47d3d5
commit 0df571b2db
63 changed files with 1212 additions and 1927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/preferences.cc
View File

@@ -2164,7 +2164,7 @@ void Preferences::cancelPressed ()
{
// set the initial theme back
if (themeFNames.at (theme->get_active_row_number ()).longFName != options.theme) {
rtengine::setPaths (options);
rtengine::setPaths();
RTImage::updateImages();
switchThemeTo (options.theme);
}
@@ -2222,7 +2222,7 @@ void Preferences::themeChanged ()
{
moptions.theme = themeFNames.at (theme->get_active_row_number ()).longFName;
rtengine::setPaths (moptions);
rtengine::setPaths();
RTImage::updateImages();
switchThemeTo (moptions.theme);
}